diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-04 21:51:44 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-04 21:51:44 +0300 |
| commit | a3af6f0f3d023bcbba7be013343b46a400cf0648 (patch) | |
| tree | ec375d94d2adfc4765bcf46b095155dbe0158ec5 /mysql-test | |
| parent | ca67f01baefbdc1e50ee3f7ca2bbe759d8017166 (diff) | |
| download | mariadb-git-a3af6f0f3d023bcbba7be013343b46a400cf0648.tar.gz | |
Fixed build errors on centos5-amd64-minimal, where we compile with very few character sets
Fixed compiler warnings
client/readline.cc:
Fixed compiler warning
mysql-test/suite/innodb/t/innodb_bug60049.test:
This test failed when running with --mysqld=--loose-innodb-fast-shutdown=2 which we do on some machines
mysql-test/t/mysqldump.test:
Only run test if utf8 is used
sql/log.cc:
Fixed compiler warning
sql/mysql_priv.h:
Fixed compiler warnings
tests/mysql_client_test.c:
Don't abort test if ucs2 is not in use.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_bug60049.test | 6 | ||||
| -rw-r--r-- | mysql-test/t/mysqldump.test | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/t/innodb_bug60049.test b/mysql-test/suite/innodb/t/innodb_bug60049.test index ec4e3b8de7e..1110f619862 100644 --- a/mysql-test/suite/innodb/t/innodb_bug60049.test +++ b/mysql-test/suite/innodb/t/innodb_bug60049.test @@ -5,6 +5,12 @@ -- source include/not_embedded.inc -- source include/have_innodb.inc +if (`SELECT @@innodb_fast_shutdown != 0`) + +{ + skip Need innodb_fast_shutdown=0; +} + CREATE TABLE t(a INT)ENGINE=InnoDB; RENAME TABLE t TO u; DROP TABLE u; diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 00d9339fcf4..99537618011 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -6,6 +6,10 @@ call mtr.add_suppression("@003f.frm' \\(errno: 22\\)"); # Binlog is required --source include/have_log_bin.inc +# utf8 is required +let collation=utf8_unicode_ci; +--source include/have_collation.inc + # Save the initial number of concurrent sessions --source include/count_sessions.inc |