From 931558eefa63dcaf9e577b8d144327e618143b54 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 15 Mar 2008 00:24:10 +0400 Subject: [PATCH 1/4] BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executed After merge fix. --- mysql-test/r/merge.result | 10 +++++----- mysql-test/suite/rpl/r/rpl_row_create_table.result | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 170cffc13d5..4c05000573c 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -969,21 +969,21 @@ CREATE TABLE m1(a INT) ENGINE=MERGE; SHOW CREATE TABLE m1; Table Create Table m1 CREATE TABLE `m1` ( - `a` int(11) default NULL + `a` int(11) DEFAULT NULL ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 DROP TABLE m1; CREATE TABLE m1(a INT) ENGINE=MERGE UNION=(); SHOW CREATE TABLE m1; Table Create Table m1 CREATE TABLE `m1` ( - `a` int(11) default NULL + `a` int(11) DEFAULT NULL ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 ALTER TABLE m1 UNION=(t1); ALTER TABLE m1 UNION=(); SHOW CREATE TABLE m1; Table Create Table m1 CREATE TABLE `m1` ( - `a` int(11) default NULL + `a` int(11) DEFAULT NULL ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1, m1; End of 5.0 tests @@ -1151,7 +1151,7 @@ SHOW CREATE TABLE t4; Table Create Table t4 CREATE TABLE `t4` ( `c1` int(11) DEFAULT NULL -) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=() +) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT INTO t4 VALUES (4); ERROR HY000: Table 't4' is read only DROP TABLE t4; @@ -1168,7 +1168,7 @@ SHOW CREATE TABLE t4; Table Create Table t4 CREATE TABLE `t4` ( `c1` int(11) DEFAULT NULL -) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=() +) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT INTO t4 VALUES (4); ERROR HY000: Table 't4' is read only DROP TABLE t4; diff --git a/mysql-test/suite/rpl/r/rpl_row_create_table.result b/mysql-test/suite/rpl/r/rpl_row_create_table.result index ba5a13a57bf..a8011756bbb 100644 --- a/mysql-test/suite/rpl/r/rpl_row_create_table.result +++ b/mysql-test/suite/rpl/r/rpl_row_create_table.result @@ -45,7 +45,7 @@ Table t2 Create Table CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=() +) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 SHOW CREATE TABLE t3; Table t3 Create Table CREATE TABLE `t3` ( @@ -64,7 +64,7 @@ Table t2 Create Table CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=() +) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 SHOW CREATE TABLE t3; Table t3 Create Table CREATE TABLE `t3` ( @@ -185,7 +185,7 @@ Table t8 Create Table CREATE TABLE `t8` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 UNION=() +) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE t9; Table t9 Create Table CREATE TABLE `t9` ( @@ -205,7 +205,7 @@ Table t8 Create Table CREATE TABLE `t8` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 UNION=() +) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE t9; Table t9 Create Table CREATE TABLE `t9` ( From 6bc335e697064b860c8805bfa05e5e6fd1d40f6e Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 14 Mar 2008 18:45:50 -0700 Subject: [PATCH 2/4] fix results after merge mysql-test/r/partition_not_windows.result: fix results from merge mysql-test/t/disabled.def: disable test partition_symlink --- mysql-test/r/partition_not_windows.result | 3 +++ mysql-test/t/disabled.def | 1 + 2 files changed, 4 insertions(+) diff --git a/mysql-test/r/partition_not_windows.result b/mysql-test/r/partition_not_windows.result index 501d3a469a1..e16cd5e8845 100644 --- a/mysql-test/r/partition_not_windows.result +++ b/mysql-test/r/partition_not_windows.result @@ -23,6 +23,9 @@ partition p01 values less than (1000) data directory='/not/existing' index directory='/not/existing' ); +Warnings: +Warning 0 DATA DIRECTORY option ignored +Warning 0 INDEX DIRECTORY option ignored show create table t2; Table Create Table t2 CREATE TABLE `t2` ( diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 9e0b681528b..d1ef92441aa 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -21,3 +21,4 @@ ctype_create : Bug#32965 main.ctype_create fails status : Bug#32966 main.status fails ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166 csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables +partition_symlink : Make pushbuild green From 6bceb154a2bb89733f5bd52410c53a9f0f183131 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 14 Mar 2008 23:01:46 -0700 Subject: [PATCH 3/4] make pushbuild green --- mysql-test/t/disabled.def | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index d1ef92441aa..eabdb8be650 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -21,4 +21,6 @@ ctype_create : Bug#32965 main.ctype_create fails status : Bug#32966 main.status fails ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166 csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables -partition_symlink : Make pushbuild green +partition_symlink : Bug#35305 Make pushbuild green +partition_basic_symlink_innodb : Bug#35306 Make pushbuild green +partition_basic_symlink_myisam : Bug#35306 Make pushbuild green From d3a0f85227e8a699d7eca6f59c74a772e8df3554 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 15 Mar 2008 01:08:35 -0700 Subject: [PATCH 4/4] make pushbuild green mysql-test/t/disabled.def: make pushbuild green, entry added to wrong disabled.def file. --- mysql-test/suite/parts/t/disabled.def | 2 ++ mysql-test/t/disabled.def | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/parts/t/disabled.def b/mysql-test/suite/parts/t/disabled.def index 408a624e707..75b19c3f25a 100644 --- a/mysql-test/suite/parts/t/disabled.def +++ b/mysql-test/suite/parts/t/disabled.def @@ -18,3 +18,5 @@ partition_value_ndb : cannot create t1 rpl_ndb_dd_partitions : cannot create t1 partition_alter4_myisam : Bug#20129 / WL#4176 partition_alter4_innodb : Bug#20129 / WL#4176 +partition_basic_symlink_innodb : Bug#35306 Make pushbuild green +partition_basic_symlink_myisam : Bug#35306 Make pushbuild green diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index eabdb8be650..2d73395cd18 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -22,5 +22,3 @@ status : Bug#32966 main.status fails ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166 csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables partition_symlink : Bug#35305 Make pushbuild green -partition_basic_symlink_innodb : Bug#35306 Make pushbuild green -partition_basic_symlink_myisam : Bug#35306 Make pushbuild green