Commit 78eb30e8 authored Aug 24, 2006 by unknown

Bug#20841 mysqldump fails to store right info with --compatible=mysql40 option

 - Add "not in version before" commensta around new syntax "WITH PARSER" and "TABLESPACE xxx STORAGE DISK"
 


mysql-test/r/ndb_dd_advance.result:
  Update result file
mysql-test/r/ndb_dd_advance2.result:
  Update result file
mysql-test/r/ndb_dd_backuprestore.result:
  Update result file
mysql-test/r/ndb_dd_basic.result:
  Update result file
mysql-test/r/ndb_dd_disk2memory.result:
  Update result file
sql/sql_show.cc:
  Add "not in version before"  comments around "WITH PARSER xxx" and "TABLESPACE xxx STORAGE DISK"
  Use STRING_WITH_LEN when adding fixed string AUTO_INCREMENT= to output from SHOW TABLE

parent 477e0b13

mysql-test/r/ndb_dd_advance.result

+7 −7

Original line number	Diff line number	Diff line
		@@ -226,7 +226,7 @@ t1 CREATE TABLE `t1` (
		`b` int(11) NOT NULL,
		`c` int(11) NOT NULL,
		PRIMARY KEY (`pk1`)
		) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE table_space1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		ALTER TABLE test.t2 TABLESPACE table_space1 STORAGE DISK
		ENGINE=NDB;
		SHOW CREATE TABLE test.t2;
		@@ -236,7 +236,7 @@ t2 CREATE TABLE `t2` (
		`b2` int(11) NOT NULL,
		`c2` int(11) NOT NULL,
		PRIMARY KEY (`pk2`)
		) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE table_space1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		ALTER TABLE test.t1 ENGINE=NDBCLUSTER;
		SHOW CREATE TABLE test.t1;
		Table Create Table
		@@ -331,7 +331,7 @@ t1 CREATE TABLE `t1` (
		`a` int(11) NOT NULL,
		`b` int(11) DEFAULT NULL,
		PRIMARY KEY (`a`)
		) TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		SHOW CREATE TABLE t2;
		Table Create Table
		t2 CREATE TABLE `t2` (
		@@ -931,7 +931,7 @@ t1 CREATE TABLE `t1` (
		`a1` int(11) DEFAULT NULL,
		`a2` blob,
		`a3` text
		) TABLESPACE ts STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		DROP TABLE test.t1;
		CREATE TABLE test.t1 (a1 INT, a2 BLOB, a3 TEXT) ENGINE=MyISAM;
		SHOW CREATE TABLE test.t1;
		@@ -950,7 +950,7 @@ t1 CREATE TABLE `t1` (
		`a1` int(11) DEFAULT NULL,
		`a2` blob,
		`a3` text
		) TABLESPACE ts STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		DROP TABLE test.t1;
		CREATE TABLE test.t1 (a1 INT PRIMARY KEY, a2 BLOB, a3 TEXT) TABLESPACE ts STORAGE DISK ENGINE=NDB;
		SHOW CREATE TABLE test.t1;
		@@ -960,7 +960,7 @@ t1 CREATE TABLE `t1` (
		`a2` blob,
		`a3` text,
		PRIMARY KEY (`a1`)
		) TABLESPACE ts STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		ALTER TABLE test.t1 ENGINE=InnoDB;
		SHOW CREATE TABLE test.t1;
		Table Create Table
		@@ -980,7 +980,7 @@ t1 CREATE TABLE `t1` (
		`a1` int(11) DEFAULT NULL,
		`a2` blob,
		`a3` text
		) TABLESPACE ts STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		ALTER TABLE test.t1 ENGINE=MyISAM;
		SHOW CREATE TABLE test.t1;
		Table Create Table

mysql-test/r/ndb_dd_advance2.result

+4 −4

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ t1 CREATE TABLE `t1` (
		`a2` varchar(256) DEFAULT NULL,
		`a3` blob,
		PRIMARY KEY (`a1`)
		) TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		SHOW CREATE TABLE test.t2;
		Table Create Table
		t2 CREATE TABLE `t2` (
		@@ -38,7 +38,7 @@ t2 CREATE TABLE `t2` (
		`a2` varchar(256) DEFAULT NULL,
		`a3` blob,
		PRIMARY KEY (`a1`)
		) TABLESPACE ts2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts2 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		INSERT INTO test.t1 VALUES (1,'111111','aaaaaaaa');
		INSERT INTO test.t1 VALUES (2,'222222','bbbbbbbb');
		SELECT * FROM test.t1 ORDER BY a1;
		@@ -93,7 +93,7 @@ t1 CREATE TABLE `t1` (
		`a2` varchar(5000) DEFAULT NULL,
		`a3` blob,
		PRIMARY KEY (`a1`)
		) TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		SHOW CREATE TABLE test.t2;
		Table Create Table
		t2 CREATE TABLE `t2` (
		@@ -101,7 +101,7 @@ t2 CREATE TABLE `t2` (
		`a2` varchar(5000) DEFAULT NULL,
		`a3` blob,
		PRIMARY KEY (`a1`)
		) TABLESPACE ts2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts2 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		INSERT INTO test.t1 VALUES (1,@vc1,@d1);
		INSERT INTO test.t1 VALUES (2,@vc2,@b1);
		INSERT INTO test.t1 VALUES (3,@vc3,@d2);

mysql-test/r/ndb_dd_backuprestore.result

+6 −6

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@ t1 CREATE TABLE `t1` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY HASH (c3) PARTITIONS 4 /
		) /!50100 TABLESPACE table_space1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY HASH (c3) PARTITIONS 4 /
		SHOW CREATE TABLE test.t2;
		Table Create Table
		t2 CREATE TABLE `t2` (
		@@ -184,7 +184,7 @@ t2 CREATE TABLE `t2` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) TABLESPACE table_space2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY KEY (c3) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) /
		) /!50100 TABLESPACE table_space2 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY KEY (c3) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) /
		SHOW CREATE TABLE test.t3;
		Table Create Table
		t3 CREATE TABLE `t3` (
		@@ -193,7 +193,7 @@ t3 CREATE TABLE `t3` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) TABLESPACE table_space2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY RANGE (c3) (PARTITION x1 VALUES LESS THAN (105) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION x3 VALUES LESS THAN (720) ENGINE = ndbcluster) /
		) /!50100 TABLESPACE table_space2 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY RANGE (c3) (PARTITION x1 VALUES LESS THAN (105) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION x3 VALUES LESS THAN (720) ENGINE = ndbcluster) /
		SHOW CREATE TABLE test.t4;
		Table Create Table
		t4 CREATE TABLE `t4` (
		@@ -341,7 +341,7 @@ t1 CREATE TABLE `t1` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY HASH (c3) PARTITIONS 4 /
		) /!50100 TABLESPACE table_space1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY HASH (c3) PARTITIONS 4 /
		SHOW CREATE TABLE test.t2;
		Table Create Table
		t2 CREATE TABLE `t2` (
		@@ -350,7 +350,7 @@ t2 CREATE TABLE `t2` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) TABLESPACE table_space2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY KEY (c3) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) /
		) /!50100 TABLESPACE table_space2 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY KEY (c3) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) /
		SHOW CREATE TABLE test.t3;
		Table Create Table
		t3 CREATE TABLE `t3` (
		@@ -359,7 +359,7 @@ t3 CREATE TABLE `t3` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) TABLESPACE table_space2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY RANGE (c3) (PARTITION x1 VALUES LESS THAN (105) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION x3 VALUES LESS THAN (720) ENGINE = ndbcluster) /
		) /!50100 TABLESPACE table_space2 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY RANGE (c3) (PARTITION x1 VALUES LESS THAN (105) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION x3 VALUES LESS THAN (720) ENGINE = ndbcluster) /
		SHOW CREATE TABLE test.t4;
		Table Create Table
		t4 CREATE TABLE `t4` (

mysql-test/r/ndb_dd_basic.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ t1 CREATE TABLE `t1` (
		`b` int(11) NOT NULL,
		`c` int(11) NOT NULL,
		PRIMARY KEY (`pk1`)
		) TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		INSERT INTO t1 VALUES (0, 0, 0);
		SELECT * FROM t1;
		pk1 b c

mysql-test/r/ndb_dd_disk2memory.result

+2 −2

Original line number	Diff line number	Diff line
		@@ -226,7 +226,7 @@ t1 CREATE TABLE `t1` (
		`b` int(11) NOT NULL,
		`c` int(11) NOT NULL,
		PRIMARY KEY (`pk1`)
		) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE table_space1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		ALTER TABLE test.t2 TABLESPACE table_space1 STORAGE DISK
		ENGINE=NDB;
		SHOW CREATE TABLE test.t2;
		@@ -236,7 +236,7 @@ t2 CREATE TABLE `t2` (
		`b2` int(11) NOT NULL,
		`c2` int(11) NOT NULL,
		PRIMARY KEY (`pk2`)
		) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE table_space1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		ALTER TABLE test.t1 ENGINE=NDBCLUSTER;
		SHOW CREATE TABLE test.t1;
		Table Create Table