1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix valgrind warning + post-merge fixes.

Browse Source 
sql/ha_innodb.cc:
  Fix valgrind warning.
strings/ctype-uca.c:
  Fix C++ style comments.
This commit is contained in:
unknown 2005-01-13 19:03:21 +03:00
parent 21dce62534
commit 0e21414aa5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/ha_innodb.cc
View File

@ -4033,8 +4033,8 @@ ha_innobase::create(
DBUG_ASSERT(innobase_table != 0); DBUG_ASSERT(innobase_table != 0);
if ((thd->lex->create_info.used_fields & HA_CREATE_USED_AUTO) && if ((create_info->used_fields & HA_CREATE_USED_AUTO) &&
(thd->lex->create_info.auto_increment_value != 0)) { (create_info->auto_increment_value != 0)) {
/* Query was ALTER TABLE...AUTO_INCREMENT = x; or /* Query was ALTER TABLE...AUTO_INCREMENT = x; or
CREATE TABLE ...AUTO_INCREMENT = x; Find out a table CREATE TABLE ...AUTO_INCREMENT = x; Find out a table
@ -4043,7 +4043,7 @@ ha_innobase::create(
auto increment field if the value is greater than the auto increment field if the value is greater than the
maximum value in the column. */ maximum value in the column. */
auto_inc_value = thd->lex->create_info.auto_increment_value; auto_inc_value = create_info->auto_increment_value;
dict_table_autoinc_initialize(innobase_table, auto_inc_value); dict_table_autoinc_initialize(innobase_table, auto_inc_value);
} }

4
strings/ctype-uca.c
View File

@ -7220,7 +7220,7 @@ static int my_strnxfrm_uca(CHARSET_INFO *cs,
uchar *dst, uint dstlen, uchar *dst, uint dstlen,
const uchar *src, uint srclen) const uchar *src, uint srclen)
{ {
uchar *de = dst + (dstlen & (uint) ~1); // add even length for easier code uchar *de = dst + (dstlen & (uint) ~1); /* add even length for easier code */
int s_res; int s_res;
my_uca_scanner scanner; my_uca_scanner scanner;
scanner_handler->init(&scanner, cs, src, srclen); scanner_handler->init(&scanner, cs, src, srclen);
@ -7238,7 +7238,7 @@ static int my_strnxfrm_uca(CHARSET_INFO *cs,
dst[1]= s_res & 0xFF; dst[1]= s_res & 0xFF;
dst+= 2; dst+= 2;
} }
if (dstlen & 1) // if odd number then fill the last char if (dstlen & 1) /* if odd number then fill the last char */
*dst= '\0'; *dst= '\0';
return dstlen; return dstlen;