diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-04 21:28:02 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-04 21:28:02 +0300 |
| commit | 3c9ae014ca93480ab7f4868d5c69db59bc1a9fd1 (patch) | |
| tree | 65d2426e219864085b0fe57f756cd982f433f6b0 /mysql-test/t | |
| parent | ca67f01baefbdc1e50ee3f7ca2bbe759d8017166 (diff) | |
| download | mariadb-git-3c9ae014ca93480ab7f4868d5c69db59bc1a9fd1.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/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/t')
| -rw-r--r-- | mysql-test/t/mysqldump.test | 4 |
1 files changed, 4 insertions, 0 deletions
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 |