#At lp:maria based on revid:monty@askmonty.org-20100828085730-dywlvwahw0yqaq1b 2895 Michael Widenius 2010-08-28 Fixed build & test failures in buildbot modified: mysql-test/t/bug46080-master.opt regex/main.c storage/maria/ma_key_recover.c storage/maria/ma_recovery.c storage/maria/ma_unique.c strings/ctype-uca.c strings/xml.c support-files/compiler_warnings.supp unittest/strings/strings-t.c per-file messages: mysql-test/t/bug46080-master.opt Lower limits to be able to run tests regex/main.c Fixed compiler warnings storage/maria/ma_key_recover.c Fixed compiler warnings storage/maria/ma_recovery.c Fixed compiler warnings storage/maria/ma_unique.c Fixed compiler warnings strings/ctype-uca.c Added comment strings/xml.c Fixed compiler warnings support-files/compiler_warnings.supp Added suppressions for windows unittest/strings/strings-t.c Added ifdef to fix compilation failure when compiling without UCA === modified file 'mysql-test/t/bug46080-master.opt' --- a/mysql-test/t/bug46080-master.opt 2009-09-11 11:00:53 +0000 +++ b/mysql-test/t/bug46080-master.opt 2010-08-28 13:51:09 +0000 @@ -1 +1 @@ ---skip-grant-tables --skip-name-resolve --safemalloc-mem-limit=20000000 +--skip-grant-tables --skip-name-resolve --safemalloc-mem-limit=20000000 --loose-maria-pagecache-buffer-size=1M === modified file 'regex/main.c' --- a/regex/main.c 2005-09-29 01:20:31 +0000 +++ b/regex/main.c 2010-08-28 13:51:09 +0000 @@ -17,8 +17,8 @@ regoff_t startoff = 0; regoff_t endoff = 0; -extern int split(); -extern void regprint(); +extern int split(char *string, char **fields, int nfields, const char *sep); +extern void regprint(my_regex_t *r, FILE *d); /* - main - do the simple case, hand off to regress() for regression === modified file 'storage/maria/ma_key_recover.c' --- a/storage/maria/ma_key_recover.c 2010-08-23 09:52:57 +0000 +++ b/storage/maria/ma_key_recover.c 2010-08-28 13:51:09 +0000 @@ -1005,7 +1005,7 @@ uint _ma_apply_redo_index(MARIA_HA *info { DBUG_PRINT("error", ("page_length %u",page_length)); DBUG_DUMP("KEY_OP_CHECK bad page", buff, max_page_length); - DBUG_ASSERT("crc" == "failure in REDO_INDEX"); + DBUG_ASSERT("crc failure in REDO_INDEX" == 0); } #endif DBUG_PRINT("redo", ("key_op_check")); === modified file 'storage/maria/ma_recovery.c' --- a/storage/maria/ma_recovery.c 2010-08-23 09:52:57 +0000 +++ b/storage/maria/ma_recovery.c 2010-08-28 13:51:09 +0000 @@ -545,7 +545,7 @@ static int display_and_apply_record(cons if (log_desc->record_execute_in_redo_phase == NULL) { /* die on all not-yet-handled records :) */ - DBUG_ASSERT("one more hook" == "to write"); + DBUG_ASSERT("one more hook to write" == 0); return 1; } if ((error= (*log_desc->record_execute_in_redo_phase)(rec))) === modified file 'storage/maria/ma_unique.c' --- a/storage/maria/ma_unique.c 2008-06-26 05:18:28 +0000 +++ b/storage/maria/ma_unique.c 2010-08-28 13:51:09 +0000 @@ -68,8 +68,7 @@ my_bool _ma_check_unique(MARIA_HA *info, DBUG_ASSERT(info->last_key.data_length == MARIA_UNIQUE_HASH_LENGTH); if (_ma_search_next(info, &info->last_key, SEARCH_BIGGER, info->s->state.key_root[def->key]) || - bcmp((char*) info->last_key.data, (char*) key_buff, - MARIA_UNIQUE_HASH_LENGTH)) + bcmp(info->last_key.data, key_buff, MARIA_UNIQUE_HASH_LENGTH)) { info->page_changed= 1; /* Can't optimize read next */ info->cur_row.lastpos= lastpos; === modified file 'strings/ctype-uca.c' --- a/strings/ctype-uca.c 2009-12-03 11:34:11 +0000 +++ b/strings/ctype-uca.c 2010-08-28 13:51:09 +0000 @@ -7002,7 +7002,7 @@ static my_uca_scanner_handler my_ucs2_uc my_uca_scanner_next_ucs2 }; -#endif +#endif /* HAVE_CHARSET_ucs2 */ /* @@ -8832,7 +8832,7 @@ CHARSET_INFO my_charset_ucs2_croatian_uc }; -#endif +#endif /* HAVE_CHARSET_ucs2 */ #ifdef HAVE_CHARSET_utf8 === modified file 'strings/xml.c' --- a/strings/xml.c 2010-08-27 14:12:44 +0000 +++ b/strings/xml.c 2010-08-28 13:51:09 +0000 @@ -123,16 +123,16 @@ static int my_xml_scan(MY_XML_PARSER *p, a->beg=p->cur; a->end=p->cur; - if ((p->end - p->cur > 3) && !bcmp(p->cur,"<!--",4)) + if ((p->end - p->cur > 3) && !bcmp((uchar*) p->cur, (uchar*) "<!--",4)) { - for (; (p->cur < p->end) && bcmp(p->cur, "-->", 3); p->cur++) + for (; (p->cur < p->end) && bcmp((uchar*) p->cur, (uchar*) "-->", 3); p->cur++) {} - if (!bcmp(p->cur, "-->", 3)) + if (!bcmp((uchar*) p->cur, (uchar*) "-->", 3)) p->cur+=3; a->end=p->cur; lex=MY_XML_COMMENT; } - else if (!bcmp(p->cur, "<![CDATA[",9)) + else if (!bcmp((uchar*) p->cur, (uchar*) "<![CDATA[",9)) { p->cur+= 9; for (; p->cur < p->end - 2 ; p->cur++) === modified file 'support-files/compiler_warnings.supp' --- a/support-files/compiler_warnings.supp 2010-08-20 13:16:47 +0000 +++ b/support-files/compiler_warnings.supp 2010-08-28 13:51:09 +0000 @@ -24,7 +24,9 @@ sql_yacc.cc : .*switch statement contain # Things that can be ignored in InnoDB # pars0grm.tab.c: .*'yyerrorlab' : unreferenced label.* +pars0grm.c: 'yyerrorlab' : unreferenced label _flex_tmp.c: .*not enough actual parameters for macro 'yywrap'.* +lexyy.c : not enough actual parameters for macro 'yywrap' pars0lex.l: .*conversion from 'ulint' to 'int', possible loss of data.* btr/btr0cur\.c: .*value computed is not used.*: 3175-3375 include/buf0buf\.ic: unused parameter .*mtr.* @@ -44,7 +46,7 @@ buf/buf0buf\.c: .*block_mutex.* might be btr/btr0cur\.c: null argument where non-null required: 1800-3000 btr/btr0btr\.c: null argument where non-null required: 2500-3000 ibuf/ibuf0ibuf.c: null argument where non-null required: 700-1000 -fsp/fsp0fsp\.c: result of 32-bit shift implicitly converted to 64 bits +fsp0fsp\.c: result of 32-bit shift implicitly converted to 64 bits # # bdb is not critical to keep up to date @@ -111,6 +113,9 @@ signal\.c : .*unused parameter.* .* : conversion from '.*size_t' to 'uint16'.* .* : The following environment variables were not found.* +# Ignore uninitialized local variables on windows +.* : uninitialized local variable .* used + # # The following should be fixed by the ndb team # === modified file 'unittest/strings/strings-t.c' --- a/unittest/strings/strings-t.c 2010-07-29 06:12:44 +0000 +++ b/unittest/strings/strings-t.c 2010-08-28 13:51:09 +0000 @@ -87,7 +87,9 @@ static CHARSET_INFO *charset_list[]= #endif #ifdef HAVE_CHARSET_utf8 &my_charset_utf8_general_ci, +#ifdef HAVE_HAVE_UCA_COLLATIONS &my_charset_utf8_unicode_ci, +#endif &my_charset_utf8_bin, #endif };