diff options
author | unknown <monty@narttu.mysql.fi> | 2003-03-17 15:05:04 +0200 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2003-03-17 15:05:04 +0200 |
commit | b0b315dce3d961e5b29830dfafdff6bc4e58aaa0 (patch) | |
tree | 7762c42e75102f122a8c9f5423ed0b676d5430a4 /mysql-test/r/analyse.result | |
parent | a821703912e84b6be1f0a686f27e1c81a0040ff8 (diff) | |
download | mariadb-git-b0b315dce3d961e5b29830dfafdff6bc4e58aaa0.tar.gz |
After merge fixes
Don't create temporary objects with no table name
myisam/mi_open.c:
After merge fix
mysql-test/r/analyse.result:
After merge fix
mysql-test/r/backup.result:
After merge fix
mysql-test/r/create.result:
After merge fix
mysql-test/r/delete.result:
After merge fix
mysql-test/r/func_like.result:
After merge fix
mysql-test/r/innodb.result:
After merge fix
mysql-test/r/rpl_loaddatalocal.result:
After merge fix
mysql-test/r/type_timestamp.result:
After merge fix
mysql-test/t/delete.test:
Change to not use table 't'
sql/sql_class.h:
Remove usage of thd when creating 'Table_ident'
Don't create temporary objects with no table name
sql/sql_derived.cc:
Indentation fix
sql/sql_select.cc:
After merge fix
Fixed wrong return -> DBUG_RETURN()
sql/sql_yacc.yy:
Remove usage of thd when creating 'Table_ident'
Diffstat (limited to 'mysql-test/r/analyse.result')
-rw-r--r-- | mysql-test/r/analyse.result | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/mysql-test/r/analyse.result b/mysql-test/r/analyse.result index 48882f42219..60764494417 100644 --- a/mysql-test/r/analyse.result +++ b/mysql-test/r/analyse.result @@ -1,6 +1,6 @@ drop table if exists t1,t2; -create table t1 (i int, j int); -insert into t1 values (1,2), (3,4), (5,6), (7,8); +create table t1 (i int, j int, empty_string char(10), bool char(1), d date); +insert into t1 values (1,2,"","Y","2002-03-03"), (3,4,"","N","2002-03-04"), (5,6,"","Y","2002-03-04"), (7,8,"","N","2002-03-05"); select count(*) from t1 procedure analyse(); Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype count(*) 4 4 1 1 0 0 4.0000 0.0000 ENUM('4') NOT NULL @@ -8,11 +8,24 @@ select * from t1 procedure analyse(); Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype t1.i 1 7 1 1 0 0 4.0000 2.2361 ENUM('1','3','5','7') NOT NULL t1.j 2 8 1 1 0 0 5.0000 2.2361 ENUM('2','4','6','8') NOT NULL +t1.empty_string 0 0 4 0 0.0000 NULL CHAR(0) NOT NULL +t1.bool N Y 1 1 0 0 1.0000 NULL ENUM('N','Y') NOT NULL +t1.d 2002-03-03 2002-03-05 10 10 0 0 10.0000 NULL ENUM('2002-03-03','2002-03-04','2002-03-05') NOT NULL +select * from t1 procedure analyse(2); +Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype +t1.i 1 7 1 1 0 0 4.0000 2.2361 TINYINT(1) UNSIGNED NOT NULL +t1.j 2 8 1 1 0 0 5.0000 2.2361 TINYINT(1) UNSIGNED NOT NULL +t1.empty_string 0 0 4 0 0.0000 NULL CHAR(0) NOT NULL +t1.bool N Y 1 1 0 0 1.0000 NULL ENUM('N','Y') NOT NULL +t1.d 2002-03-03 2002-03-05 10 10 0 0 10.0000 NULL ENUM('2002-03-03','2002-03-04','2002-03-05') NOT NULL create table t2 select * from t1 procedure analyse(); select * from t2; Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype t1.i 1 7 1 1 0 0 4.0000 2.2361 ENUM('1','3','5','7') NOT NULL t1.j 2 8 1 1 0 0 5.0000 2.2361 ENUM('2','4','6','8') NOT NULL +t1.empty_string 0 0 4 0 0.0000 NULL CHAR(0) NOT NULL +t1.bool N Y 1 1 0 0 1.0000 NULL ENUM('N','Y') NOT NULL +t1.d 2002-03-03 2002-03-05 10 10 0 0 10.0000 NULL ENUM('2002-03-03','2002-03-04','2002-03-05') NOT NULL drop table t1,t2; EXPLAIN SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE(); id select_type table type possible_keys key key_len ref rows Extra |