#At lp:maria based on revid:monty@askmonty.org-20100513110053-tfq1g55u5ml6cqcl 2865 Michael Widenius 2010-05-14 Fixed build failures and compiler warning modified: mysql-test/suite/binlog/r/binlog_unsafe.result mysql-test/t/information_schema_all_engines.test storage/pbxt/bin/Makefile.am storage/pbxt/bin/xtstat_xt.cc storage/pbxt/src/datalog_xt.cc storage/pbxt/src/ha_pbxt.cc storage/pbxt/src/table_xt.cc support-files/compiler_warnings.supp per-file messages: mysql-test/suite/binlog/r/binlog_unsafe.result Updated results (RAND() doesn't require statement based logging anymore for inserts) mysql-test/t/information_schema_all_engines.test Ensure that InnoDB is used storage/pbxt/bin/Makefile.am Fixed build failure on build hosts (Patch from Kristian Nielsen) storage/pbxt/bin/xtstat_xt.cc Added missing argument storage/pbxt/src/datalog_xt.cc Fixed compiler warnings storage/pbxt/src/ha_pbxt.cc Fixed compiler warnings storage/pbxt/src/table_xt.cc Fixed compiler warnings support-files/compiler_warnings.supp Added suppression of compiler warnings in Xtradb (Failure can only happen for corrupted tables, but should be fixed properly at some point) === modified file 'mysql-test/suite/binlog/r/binlog_unsafe.result' --- a/mysql-test/suite/binlog/r/binlog_unsafe.result 2010-03-04 08:03:07 +0000 +++ b/mysql-test/suite/binlog/r/binlog_unsafe.result 2010-05-14 11:56:14 +0000 @@ -380,8 +380,6 @@ INSERT INTO t1 VALUES (VERSION()); Warnings: Note 1592 Statement may not be safe to log in statement format. INSERT INTO t1 VALUES (RAND()); -Warnings: -Note 1592 Statement may not be safe to log in statement format. DELETE FROM t1; SET TIME_ZONE= '+03:00'; SET TIMESTAMP=1000000; === modified file 'mysql-test/t/information_schema_all_engines.test' --- a/mysql-test/t/information_schema_all_engines.test 2009-06-05 15:35:22 +0000 +++ b/mysql-test/t/information_schema_all_engines.test 2010-05-14 11:56:14 +0000 @@ -4,7 +4,8 @@ --source include/not_embedded.inc --source include/have_pbxt.inc --- source include/not_staging.inc +--source include/have_innodb.inc +--source include/not_staging.inc use INFORMATION_SCHEMA; --replace_result Tables_in_INFORMATION_SCHEMA Tables_in_information_schema === modified file 'storage/pbxt/bin/Makefile.am' --- a/storage/pbxt/bin/Makefile.am 2010-05-11 13:45:45 +0000 +++ b/storage/pbxt/bin/Makefile.am 2010-05-14 11:56:14 +0000 @@ -5,10 +5,10 @@ INCLUDES = -I$(top_srcdir)/include -I$(t -I$(top_srcdir)/storage/innobase/include \ -I$(top_srcdir)/sql \ -I$(srcdir) \ - -I../src + -I$(srcdir)/../src bin_PROGRAMS = xtstat xtstat_SOURCES = xtstat_xt.cc ../src/strutil_xt.cc -xtstat_LDADD = $(top_srcdir)/libmysql/libmysqlclient.la +xtstat_LDADD = $(top_builddir)/libmysql/libmysqlclient.la === modified file 'storage/pbxt/bin/xtstat_xt.cc' --- a/storage/pbxt/bin/xtstat_xt.cc 2010-05-11 13:45:45 +0000 +++ b/storage/pbxt/bin/xtstat_xt.cc 2010-05-14 11:56:14 +0000 @@ -93,7 +93,7 @@ struct Options { "Connection protocol to use: default/tcp/socket/pipe/memory", "default", MYSQL_PROTOCOL_DEFAULT, false }, { OPT_DISPLAY, 0, "display", OPT_HAS_VALUE, "Columns to display: use short names separated by |, partial match allowed", "time-msec,commt,row-ins,rec,ind,ilog,xlog,data,to,dirty", 0, false }, - { OPT_NONE, 0, NULL, 0, NULL, 0, false } + { OPT_NONE, 0, NULL, 0, NULL, NULL, 0, false } }; #ifdef XT_WIN === modified file 'storage/pbxt/src/datalog_xt.cc' --- a/storage/pbxt/src/datalog_xt.cc 2010-05-05 10:59:57 +0000 +++ b/storage/pbxt/src/datalog_xt.cc 2010-05-14 11:56:14 +0000 @@ -1249,7 +1249,7 @@ xtBool XTDataLogBuffer::dlb_write_thru_l */ dlb_data_log->dlf_log_eof += size; #ifdef DEBUG - if (log_offset + size > dlb_max_write_offset) + if ((ulonglong) (log_offset + size) > (ulonglong) dlb_max_write_offset) dlb_max_write_offset = log_offset + size; #endif dlb_flush_required = TRUE; @@ -1291,7 +1291,7 @@ xtBool XTDataLogBuffer::dlb_append_log(x if (!xt_pwrite_file(dlb_data_log->dlf_log_file, log_offset, size, data, &thread->st_statistics.st_data, thread)) return FAILED; #ifdef DEBUG - if (log_offset + size > dlb_max_write_offset) + if ((ulonglong) (log_offset + size) > (ulonglong) dlb_max_write_offset) dlb_max_write_offset = log_offset + size; #endif dlb_flush_required = TRUE; @@ -1734,8 +1734,8 @@ static xtBool dl_collect_garbage(XTThrea xtLogOffset src_log_offset; xtLogID curr_log_id; xtLogOffset curr_log_offset; - xtLogID dest_log_id; - xtLogOffset dest_log_offset; + xtLogID dest_log_id= 0; + xtLogOffset dest_log_offset= 0; off_t garbage_count = 0; memset(&cs, 0, sizeof(XTCompactorStateRec)); === modified file 'storage/pbxt/src/ha_pbxt.cc' --- a/storage/pbxt/src/ha_pbxt.cc 2010-05-12 14:27:18 +0000 +++ b/storage/pbxt/src/ha_pbxt.cc 2010-05-14 11:56:14 +0000 @@ -1609,7 +1609,7 @@ static int pbxt_prepare(handlerton *hton return err; } -static XTThreadPtr ha_temp_open_global_database(handlerton *hton, THD **ret_thd, int *temp_thread, char *thread_name, int *err) +static XTThreadPtr ha_temp_open_global_database(handlerton *hton, THD **ret_thd, int *temp_thread, const char *thread_name, int *err) { THD *thd; XTThreadPtr self = NULL; === modified file 'storage/pbxt/src/table_xt.cc' --- a/storage/pbxt/src/table_xt.cc 2010-05-06 12:42:28 +0000 +++ b/storage/pbxt/src/table_xt.cc 2010-05-14 11:56:14 +0000 @@ -1793,10 +1793,12 @@ xtPublic void xt_check_table(XTThreadPtr XTTableHPtr tab = ot->ot_table; xtRecordID prec_id; XTTabRecExtDPtr rec_buf = (XTTabRecExtDPtr) ot->ot_row_rbuffer; +#ifdef CHECK_TABLE_READ_DATA_LOG XTactExtRecEntryDRec ext_rec; size_t log_size; xtLogID log_id; xtLogOffset log_offset; +#endif xtRecordID rec_id; xtRecordID prev_rec_id; xtXactID xn_id; === modified file 'support-files/compiler_warnings.supp' --- a/support-files/compiler_warnings.supp 2010-04-07 15:26:30 +0000 +++ b/support-files/compiler_warnings.supp 2010-05-14 11:56:14 +0000 @@ -41,6 +41,8 @@ sync/sync0sync\.c: unused variable ut/ut0ut\.c: ignoring return value of srv/srv0srv\.c: value computed is not used buf/buf0buf\.c: .*block_mutex.* might be used uninitialized +btr/btr0cur\.c: null argument where non-null required: 1800-3000 +ibuf/ibuf0ibuf.c: null argument where non-null required: 700-100 # # bdb is not critical to keep up to date