database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Automatic merge with 5.1

Browse Source
This commit is contained in:
Michael Widenius
2011-05-04 22:25:56 +03:00
parent 7191a44b4c a67a5dd6f9
commit 718ddbb2ca
7 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/mysql_client_test.c
View File

@ -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);