database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fixed build errors on centos5-amd64-minimal, where we compile with very few character sets

Browse Source 
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.
This commit is contained in:
Michael Widenius
2011-05-04 21:28:02 +03:00
parent ca67f01bae
commit 3c9ae014ca
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/mysql_client_test.c
View File

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