diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-23 18:49:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-04-24 18:15:20 +0200 |
| commit | 7b58fd5ef0c1ecdc7c6d6d3347110620e67313c2 (patch) | |
| tree | cc7adc5f126e8002efffe8e06741bc6aee55441a /tests/mysql_client_test.c | |
| parent | 0ee919b86e214a79541f1e9a16b63ae8784b4790 (diff) | |
| download | mariadb-git-7b58fd5ef0c1ecdc7c6d6d3347110620e67313c2.tar.gz | |
tests -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
This fixes:
MDEV-7693 MariaDB - mysql-test - SUITE:funcs_1 - funcs_1.is_tables_mysql is failing on TABLE_COLLATION /DATABASE_COLLATION
MDEV-8487 mysql-test - main.information_schema 'xtradb' fails
MDEV-8486 mysql-test - main.bootstrap fails
Diffstat (limited to 'tests/mysql_client_test.c')
| -rw-r--r-- | tests/mysql_client_test.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 473084e1b57..fcc89482f4e 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -2261,7 +2261,7 @@ static void test_ps_query_cache() return; } - rc= mysql_query(mysql, "SET SQL_MODE=''"); + rc= mysql_set_character_set(mysql, "utf8"); myquery(rc); /* prepare the table */ @@ -2306,7 +2306,7 @@ static void test_ps_query_cache() mysql_close(lmysql); DIE_UNLESS(0); } - rc= mysql_query(lmysql, "SET SQL_MODE=''"); + rc= mysql_set_character_set(lmysql, "utf8"); myquery(rc); if (!opt_silent) @@ -16647,7 +16647,7 @@ static void test_bug30472() /* Switch client character set. */ - DIE_IF(mysql_set_character_set(&con, "utf8")); + DIE_IF(mysql_set_character_set(&con, "latin2")); /* Retrieve character set information. */ @@ -16663,10 +16663,10 @@ static void test_bug30472() 2) new character set is different from the original one. */ - DIE_UNLESS(strcmp(character_set_name_2, "utf8") == 0); - DIE_UNLESS(strcmp(character_set_client_2, "utf8") == 0); - DIE_UNLESS(strcmp(character_set_results_2, "utf8") == 0); - DIE_UNLESS(strcmp(collation_connnection_2, "utf8_general_ci") == 0); + DIE_UNLESS(strcmp(character_set_name_2, "latin2") == 0); + DIE_UNLESS(strcmp(character_set_client_2, "latin2") == 0); + DIE_UNLESS(strcmp(character_set_results_2, "latin2") == 0); + DIE_UNLESS(strcmp(collation_connnection_2, "latin2_general_ci") == 0); DIE_UNLESS(strcmp(character_set_name_1, character_set_name_2) != 0); DIE_UNLESS(strcmp(character_set_client_1, character_set_client_2) != 0); |