Commit 80ba8556 authored by Michael Widenius's avatar Michael Widenius

Fixed compiler warnings

Fixed failing test innodb.innodb-autoinc.test
Enabled innodb test suite

mysql-test/mysql-test-run.pl:
  Enabled innodb test suite
mysql-test/r/innodb-autoinc.result:
  Removed test as it exists in suite innodb
mysql-test/suite/innodb/t/disabled.def:
  Removed innodb-autoinc
mysql-test/suite/innodb/t/innodb-autoinc.test:
  Update to be able to run with plugin
mysql-test/t/innodb-autoinc.test:
  Removed test as it exists in suite innodb
sql/filesort.cc:
  Removed not used variable
sql/slave.cc:
  Remove compiler warnings
storage/pbxt/src/ha_pbxt.cc:
  Removed not used variable
storage/xtradb/dict/dict0crea.c:
  Fixed compiler warning about unsigned comparison
support-files/compiler_warnings.supp:
  Disable some not relevant warnings
parent 9e23495b
......@@ -129,7 +129,7 @@ my $path_config_file; # The generated config file, var/my.cnf
# executables will be used by the test suite.
our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
my $DEFAULT_SUITES= "main,binlog,federated,rpl,maria,parts";
my $DEFAULT_SUITES= "main,binlog,federated,rpl,maria,parts,innodb";
my $opt_suites;
our $opt_verbose= 0; # Verbose output, enable with --verbose
......
This diff is collapsed.
......@@ -12,4 +12,3 @@
innodb : Bug#53306 2010-04-30 VasilDimov valgrind warnings
innodb_bug52663 : Waiting for merge with XtraDB
innodb_bug51920 : Waiting for merge with XtraDB
innodb-autoinc : Automatic file format change to Barracuda
......@@ -2,6 +2,8 @@
# embedded server ignores 'delayed', so skip this
-- source include/not_embedded.inc
let $file_format_check=`select @@innodb_file_format_check`;
--disable_warnings
drop table if exists t1;
--enable_warnings
......@@ -662,3 +664,7 @@ INSERT INTO t1 VALUES (1), (2), (-685113344), (NULL);
SELECT * FROM t1;
SHOW CREATE TABLE t1;
DROP TABLE t1;
--disable_query_log
EVAL SET GLOBAL innodb_file_format_check=$file_format_check;
--enable_query_log
This diff is collapsed.
......@@ -609,7 +609,6 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select,
if (error == 0)
param->examined_rows++;
int rc= 0;
if (error == 0 && (!select || select->skip_record(thd) > 0))
{
if (idx == param->keys)
......
......@@ -2849,7 +2849,6 @@ pthread_handler_t handle_slave_sql(void *arg)
my_off_t saved_log_pos;
my_off_t saved_master_log_pos;
my_off_t saved_skip= 0;
Relay_log_info* rli = &((Master_info*)arg)->rli;
const char *errmsg;
......@@ -2857,6 +2856,8 @@ pthread_handler_t handle_slave_sql(void *arg)
my_thread_init();
DBUG_ENTER("handle_slave_sql");
LINT_INIT(saved_master_log_pos);
LINT_INIT(saved_log_pos);
DBUG_ASSERT(rli->inited);
pthread_mutex_lock(&rli->run_lock);
DBUG_ASSERT(!rli->slave_running);
......
......@@ -1232,8 +1232,6 @@ static int pbxt_init(void *p)
THD *thd = NULL;
#ifndef DRIZZLED
extern myxt_mutex_t LOCK_plugin;
/* {MYSQL QUIRK}
* I have to release this lock for PBXT recovery to
* work, because it needs to open .frm files.
......@@ -1251,6 +1249,7 @@ static int pbxt_init(void *p)
* plugin at the same time.
*/
#if MYSQL_VERSION_ID <= 50146
extern myxt_mutex_t LOCK_plugin;
myxt_mutex_unlock(&LOCK_plugin);
#endif
#endif
......
......@@ -97,8 +97,8 @@ dict_create_sys_tables_tuple(
if (table->flags & ~DICT_TF_COMPACT) {
ut_a(table->flags & DICT_TF_COMPACT);
ut_a(dict_table_get_format(table) >= DICT_TF_FORMAT_ZIP);
ut_a((table->flags & DICT_TF_ZSSIZE_MASK)
<= (DICT_TF_ZSSIZE_MAX << DICT_TF_ZSSIZE_SHIFT));
ut_a(((ulonglong) table->flags & DICT_TF_ZSSIZE_MASK)
<= (ulonglong) (DICT_TF_ZSSIZE_MAX << DICT_TF_ZSSIZE_SHIFT));
ut_a(!(table->flags & (~0 << DICT_TF_BITS)));
mach_write_to_4(ptr, table->flags);
} else {
......
......@@ -42,7 +42,8 @@ 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
btr/btr0btr\.c: null argument where non-null required: 2500-3000
ibuf/ibuf0ibuf.c: null argument where non-null required: 700-1000
#
# bdb is not critical to keep up to date
......@@ -129,6 +130,7 @@ xaction_xt\.cc: may be used uninitialized in this function
#
storage/pbxt/ : typedef.*was ignored in this declaration
ha_pbxt\.cc : variable.*might be clobbered by.*longjmp
table_xt\.cc : variable.*might be clobbered by ~longjm~p or ~vfork~
#
# Yassl
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment