diff options
Diffstat (limited to 'mysql-test/main/mysql_client_test.result')
| -rw-r--r-- | mysql-test/main/mysql_client_test.result | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/main/mysql_client_test.result b/mysql-test/main/mysql_client_test.result index 06794a0e5ec..420e2fc8e3c 100644 --- a/mysql-test/main/mysql_client_test.result +++ b/mysql-test/main/mysql_client_test.result @@ -1,3 +1,9 @@ +SET @save_character_set_client= @@global.character_set_client; +SET @save_collation_connection= @@global.collation_connection; +SET @@global.character_set_server= @@character_set_server; +SET @@global.collation_server= @@collation_server; +SET @@global.character_set_client= @@character_set_server; +SET @@global.collation_connection= @@collation_server; SET @old_general_log= @@global.general_log; SET @old_slow_query_log= @@global.slow_query_log; call mtr.add_suppression(" Error reading file './client_test_db/test_frm_bug.frm'"); @@ -246,3 +252,7 @@ ANALYZE JSON DELETE number of fields: 1 SET @@global.general_log= @old_general_log; SET @@global.slow_query_log= @old_slow_query_log; +SET @@global.character_set_server= @save_character_set_server; +SET @@global.collation_server= @save_collation_server; +SET @@global.character_set_client= @save_character_set_client; +SET @@global.collation_connection= @save_collation_connection; |