diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-04 22:25:56 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-04 22:25:56 +0300 |
| commit | 718ddbb2cab5667aa5018edc466a2e45ced8b3f9 (patch) | |
| tree | 1138da18b4151b27c99530888ec4172492b41dda /tests | |
| parent | 7191a44b4c03a14c841a4572b808b799753dec87 (diff) | |
| parent | a67a5dd6f956bf6f62799eafa2c67d008ee15e24 (diff) | |
| download | mariadb-git-718ddbb2cab5667aa5018edc466a2e45ced8b3f9.tar.gz | |
Automatic merge with 5.1
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 9f87ee2abcd..c6efdca60f6 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -18467,7 +18467,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); |