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

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2016-09-09 08:33:08 +02:00
parent 1f2ff25eba 8494039757
commit 06b7fce9f2
579 changed files with 9031 additions and 4828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/mysql_client_test.c
View File

@@ -18508,6 +18508,7 @@ static void test_bug58036()
/* Part1: try to connect with ucs2 client character set */
conn= mysql_client_init(NULL);
mysql_options(conn, MYSQL_SET_CHARSET_NAME, "ucs2");
if (mysql_real_connect(conn, opt_host, opt_user,
opt_password, opt_db ? opt_db : "test",
opt_port, opt_unix_socket, 0))
@@ -18558,7 +18559,6 @@ static void test_bug58036()
printf("Got mysql_change_user() error (expected): %s (%d)\n",
mysql_error(conn), mysql_errno(conn));
mysql_close(conn);
DBUG_VOID_RETURN;
}
@@ -19417,6 +19417,7 @@ static void test_big_packet()
opt_password, current_db, opt_port,
opt_unix_socket, 0)))
{
mysql_close(mysql_local);
fprintf(stderr, "\n connection failed(%s)", mysql_error(mysql_local));
exit(1);
}