diff options
Diffstat (limited to 'mysql-test/main/mysqlcheck.result')
| -rw-r--r-- | mysql-test/main/mysqlcheck.result | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/mysql-test/main/mysqlcheck.result b/mysql-test/main/mysqlcheck.result index 02ab2af9fc1..8b6a19b5270 100644 --- a/mysql-test/main/mysqlcheck.result +++ b/mysql-test/main/mysqlcheck.result @@ -1,4 +1,6 @@ call mtr.add_suppression("Invalid .old.. table or database name"); +set @save_character_set_client=@@character_set_client; +set @save_collation_connection=@@collation_connection; DROP TABLE IF EXISTS t1, `t``1`, `t 1`, test.`t.1`, v1; drop view if exists t1, `t``1`, `t 1`, test.`t.1`, v1; drop database if exists client_test_db; @@ -218,7 +220,9 @@ CREATE TABLE `#mysql50#@` (a INT) engine=myisam; SHOW TABLES; Tables_in_test #mysql50#@ -SET NAMES DEFAULT; +set @@character_set_client=@save_character_set_client; +set @@character_set_results=@save_character_set_client; +set @@collation_connection=@save_collation_connection; mysqlcheck --fix-table-names --databases test SET NAMES utf8; SHOW TABLES; @@ -226,7 +230,9 @@ Tables_in_test @ DROP TABLE `@`; CREATE TABLE `я` (a INT) engine=myisam; -SET NAMES DEFAULT; +set @@character_set_client=@save_character_set_client; +set @@character_set_results=@save_character_set_client; +set @@collation_connection=@save_collation_connection; call mtr.add_suppression("@003f.frm' \\(errno: 22\\)"); mysqlcheck --default-character-set="latin1" --databases test call mtr.add_suppression("Can't find file: '..test.@003f.frm'"); @@ -237,7 +243,9 @@ mysqlcheck --default-character-set="utf8" --databases test test.я OK SET NAMES utf8; DROP TABLE `я`; -SET NAMES DEFAULT; +set @@character_set_client=@save_character_set_client; +set @@character_set_results=@save_character_set_client; +set @@collation_connection=@save_collation_connection; CREATE DATABASE `#mysql50#a@b`; USE `#mysql50#a@b`; CREATE TABLE `#mysql50#c@d` (a INT) engine=myisam; @@ -468,11 +476,11 @@ drop database mysqltest1; # create table t1(a int); insert into t1 (a) values (1), (2), (3); -select db_name,table_name,column_name,min_value,max_value,nulls_ratio,avg_length,avg_frequency,hist_size,hist_type from mysql.column_stats order by db_name,table_name; -db_name table_name column_name min_value max_value nulls_ratio avg_length avg_frequency hist_size hist_type +select db_name,table_name,column_name,min_value,max_value,nulls_ratio,avg_length,avg_frequency from mysql.column_stats order by db_name,table_name; +db_name table_name column_name min_value max_value nulls_ratio avg_length avg_frequency test.t1 Engine-independent statistics collected status : OK -select db_name,table_name,column_name,min_value,max_value,nulls_ratio,avg_length,avg_frequency,hist_size,hist_type from mysql.column_stats where db_name = 'test' and table_name = 't1' order by db_name,table_name; -db_name table_name column_name min_value max_value nulls_ratio avg_length avg_frequency hist_size hist_type -test t1 a 1 3 0.0000 4.0000 1.0000 254 DOUBLE_PREC_HB +select db_name,table_name,column_name,min_value,max_value,nulls_ratio,avg_length,avg_frequency from mysql.column_stats where db_name = 'test' and table_name = 't1' order by db_name,table_name; +db_name table_name column_name min_value max_value nulls_ratio avg_length avg_frequency +test t1 a 1 3 0.0000 4.0000 1.0000 drop table t1; |