database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fixed build failures and compiler warning

Browse Source 
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)
This commit is contained in:
Michael Widenius
2010-05-14 14:56:14 +03:00
parent 6659ad49fe
commit 73d3805d00
8 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/binlog/r/binlog_unsafe.result
View File

@@ -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;

1
mysql-test/t/information_schema_all_engines.test
View File

@@ -4,6 +4,7 @@
--source include/not_embedded.inc
--source include/have_pbxt.inc
--source include/have_innodb.inc
--source include/not_staging.inc
use INFORMATION_SCHEMA;

4
storage/pbxt/bin/Makefile.am
View File

@@ -5,10 +5,10 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
-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

2
storage/pbxt/bin/xtstat_xt.cc
View File

@@ -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

8
storage/pbxt/src/datalog_xt.cc
View File

@@ -1249,7 +1249,7 @@ xtBool XTDataLogBuffer::dlb_write_thru_log(xtLogID XT_NDEBUG_UNUSED(log_id), xtL
*/
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(xtLogID XT_NDEBUG_UNUSED(log_id), xtLogOf
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(XTThreadPtr self, XTDatabaseHPtr db, XTDataLogF
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));

2
storage/pbxt/src/ha_pbxt.cc
View File

@@ -1609,7 +1609,7 @@ static int pbxt_prepare(handlerton *hton, THD *thd, bool all)
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;

2
storage/pbxt/src/table_xt.cc
View File

@@ -1793,10 +1793,12 @@ xtPublic void xt_check_table(XTThreadPtr self, XTOpenTablePtr ot)
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;

2
support-files/compiler_warnings.supp
View File

@@ -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