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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 22d62d9a661..bbb98229222 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -18466,7 +18466,8 @@ static void test_bug58036() if (!opt_silent) printf("Got mysql_real_connect() error (expected): %s (%d)\n", mysql_error(conn), mysql_errno(conn)); - DIE_UNLESS(mysql_errno(conn) == ER_WRONG_VALUE_FOR_VAR); + DIE_UNLESS(mysql_errno(conn) == ER_WRONG_VALUE_FOR_VAR || + mysql_errno(conn)== CR_CANT_READ_CHARSET); mysql_close(conn); |