summaryrefslogtreecommitdiff
path: root/mysql-test/main/show_check.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/main/show_check.test')
-rw-r--r--mysql-test/main/show_check.test9
1 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/main/show_check.test b/mysql-test/main/show_check.test
index d9025bc8d10..d56202d0773 100644
--- a/mysql-test/main/show_check.test
+++ b/mysql-test/main/show_check.test
@@ -17,6 +17,11 @@
# depends on the presence of the log tables (which are CSV-based).
--source include/have_csv.inc
+# Test results assumes we are using latin1
+--source include/default_charset.inc
+SET @@global.character_set_server= @@session.character_set_server;
+set @@sql_mode="STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION";
+
#
# Test of some show commands
#
@@ -261,7 +266,7 @@ SET sql_mode= @old_sql_mode;
# Test for Bug#2719 Heap tables status shows wrong or missing data.
#
-select @@max_heap_table_size;
+set @@max_heap_table_size=1048576;
CREATE TABLE t1 (
a int(11) default NULL,
@@ -1406,3 +1411,5 @@ SHOW WARNINGS;
SHOW CONTRIBUTORS;
--enable_result_log
SHOW WARNINGS;
+
+SET @@global.character_set_server=@save_character_set_server;