diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-05-27 20:18:31 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-05-27 20:18:31 +0300 |
| commit | 80ba8556e772fd7e4eb369c64bb32ca44f93e221 (patch) | |
| tree | cf991484ab999e60eb9b33d81733fca16b368cf9 /storage/xtradb | |
| parent | 9e23495b1dc988526776768f50a30f647d793d14 (diff) | |
| download | mariadb-git-80ba8556e772fd7e4eb369c64bb32ca44f93e221.tar.gz | |
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
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/dict/dict0crea.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/xtradb/dict/dict0crea.c b/storage/xtradb/dict/dict0crea.c index f548d89bc68..e315716551e 100644 --- a/storage/xtradb/dict/dict0crea.c +++ b/storage/xtradb/dict/dict0crea.c @@ -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 { |