Below is the list of changes that have just been committed into a local
6.0 repository of gluh. When gluh does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-11-15 12:07:01+04:00, gluh@stripped +12 -0
after merge fix
mysql-test/r/subselect_no_mat.result@stripped, 2007-11-15 12:06:58+04:00, gluh@stripped +49 -0
udated result file
mysql-test/r/subselect_no_opts.result@stripped, 2007-11-15 12:06:58+04:00, gluh@stripped +49 -0
udated result file
mysql-test/r/subselect_no_semijoin.result@stripped, 2007-11-15 12:06:58+04:00, gluh@stripped +49 -0
udated result file
mysql-test/suite/funcs_1/r/innodb__datadict.result@stripped, 2007-11-15 12:06:58+04:00, gluh@stripped +9 -9
udated result file
mysql-test/suite/funcs_1/r/memory__datadict.result@stripped, 2007-11-15 12:06:58+04:00, gluh@stripped +9 -9
udated result file
mysql-test/suite/funcs_1/r/myisam__datadict.result@stripped, 2007-11-15 12:06:58+04:00, gluh@stripped +9 -9
udated result file
mysql-test/suite/funcs_1/t/disabled.def@stripped, 2007-11-15 12:06:58+04:00, gluh@stripped +0 -4
after merge fix
mysql-test/suite/ndb/r/ndb_alter_table_online.result@stripped, 2007-11-15 12:06:58+04:00, gluh@stripped +404 -101
udated result file
mysql-test/suite/ndb/r/ndb_alter_table_online2.result@stripped, 2007-11-15 12:06:58+04:00, gluh@stripped +85 -2
udated result file
mysql-test/suite/ndb/r/ndb_dd_basic.result@stripped, 2007-11-15 12:06:58+04:00, gluh@stripped +3 -7
udated result file
mysql-test/suite/ndb/t/ndb_dd_basic.test@stripped, 2007-11-15 12:06:58+04:00, gluh@stripped +3 -3
after merge fix
sql/sql_show.cc@stripped, 2007-11-15 12:06:58+04:00, gluh@stripped +1 -1
after merge fix
diff -Nrup a/mysql-test/r/subselect_no_mat.result b/mysql-test/r/subselect_no_mat.result
--- a/mysql-test/r/subselect_no_mat.result 2007-11-07 17:09:57 +04:00
+++ b/mysql-test/r/subselect_no_mat.result 2007-11-15 12:06:58 +04:00
@@ -4145,6 +4145,55 @@ SELECT ((a1,a2) IN (SELECT * FROM t2 WHE
0
0
DROP TABLE t1, t2;
+CREATE TABLE t1 (s1 BINARY(5), s2 VARBINARY(5));
+INSERT INTO t1 VALUES (0x41,0x41), (0x42,0x42), (0x43,0x43);
+SELECT s1, s2 FROM t1 WHERE s2 IN (SELECT s1 FROM t1);
+s1 s2
+SELECT s1, s2 FROM t1 WHERE (s2, 10) IN (SELECT s1, 10 FROM t1);
+s1 s2
+CREATE INDEX I1 ON t1 (s1);
+CREATE INDEX I2 ON t1 (s2);
+SELECT s1, s2 FROM t1 WHERE s2 IN (SELECT s1 FROM t1);
+s1 s2
+SELECT s1, s2 FROM t1 WHERE (s2, 10) IN (SELECT s1, 10 FROM t1);
+s1 s2
+TRUNCATE t1;
+INSERT INTO t1 VALUES (0x41,0x41);
+SELECT * FROM t1 WHERE s1 = (SELECT s2 FROM t1);
+s1 s2
+DROP TABLE t1;
+CREATE TABLE t1 (a1 VARBINARY(2) NOT NULL DEFAULT '0', PRIMARY KEY (a1));
+CREATE TABLE t2 (a2 BINARY(2) default '0', INDEX (a2));
+CREATE TABLE t3 (a3 BINARY(2) default '0');
+INSERT INTO t1 VALUES (1),(2),(3),(4);
+INSERT INTO t2 VALUES (1),(2),(3);
+INSERT INTO t3 VALUES (1),(2),(3);
+SELECT LEFT(t2.a2, 1) FROM t2,t3 WHERE t3.a3=t2.a2;
+LEFT(t2.a2, 1)
+1
+2
+3
+SELECT t1.a1, t1.a1 in (SELECT t2.a2 FROM t2,t3 WHERE t3.a3=t2.a2) FROM t1;
+a1 t1.a1 in (SELECT t2.a2 FROM t2,t3 WHERE t3.a3=t2.a2)
+1 0
+2 0
+3 0
+4 0
+DROP TABLE t1,t2,t3;
+CREATE TABLE t1 (a1 BINARY(3) PRIMARY KEY, b1 VARBINARY(3));
+CREATE TABLE t2 (a2 VARBINARY(3) PRIMARY KEY);
+CREATE TABLE t3 (a3 VARBINARY(3) PRIMARY KEY);
+INSERT INTO t1 VALUES (1,10), (2,20), (3,30), (4,40);
+INSERT INTO t2 VALUES (2), (3), (4), (5);
+INSERT INTO t3 VALUES (10), (20), (30);
+SELECT LEFT(t1.a1,1) FROM t1,t3 WHERE t1.b1=t3.a3;
+LEFT(t1.a1,1)
+1
+2
+3
+SELECT a2 FROM t2 WHERE t2.a2 IN (SELECT t1.a1 FROM t1,t3 WHERE t1.b1=t3.a3);
+a2
+DROP TABLE t1, t2, t3;
End of 5.0 tests.
create table t_out (subcase char(3),
a1 char(2), b1 char(2), c1 char(2));
diff -Nrup a/mysql-test/r/subselect_no_opts.result b/mysql-test/r/subselect_no_opts.result
--- a/mysql-test/r/subselect_no_opts.result 2007-11-07 14:45:06 +04:00
+++ b/mysql-test/r/subselect_no_opts.result 2007-11-15 12:06:58 +04:00
@@ -4145,6 +4145,55 @@ SELECT ((a1,a2) IN (SELECT * FROM t2 WHE
0
0
DROP TABLE t1, t2;
+CREATE TABLE t1 (s1 BINARY(5), s2 VARBINARY(5));
+INSERT INTO t1 VALUES (0x41,0x41), (0x42,0x42), (0x43,0x43);
+SELECT s1, s2 FROM t1 WHERE s2 IN (SELECT s1 FROM t1);
+s1 s2
+SELECT s1, s2 FROM t1 WHERE (s2, 10) IN (SELECT s1, 10 FROM t1);
+s1 s2
+CREATE INDEX I1 ON t1 (s1);
+CREATE INDEX I2 ON t1 (s2);
+SELECT s1, s2 FROM t1 WHERE s2 IN (SELECT s1 FROM t1);
+s1 s2
+SELECT s1, s2 FROM t1 WHERE (s2, 10) IN (SELECT s1, 10 FROM t1);
+s1 s2
+TRUNCATE t1;
+INSERT INTO t1 VALUES (0x41,0x41);
+SELECT * FROM t1 WHERE s1 = (SELECT s2 FROM t1);
+s1 s2
+DROP TABLE t1;
+CREATE TABLE t1 (a1 VARBINARY(2) NOT NULL DEFAULT '0', PRIMARY KEY (a1));
+CREATE TABLE t2 (a2 BINARY(2) default '0', INDEX (a2));
+CREATE TABLE t3 (a3 BINARY(2) default '0');
+INSERT INTO t1 VALUES (1),(2),(3),(4);
+INSERT INTO t2 VALUES (1),(2),(3);
+INSERT INTO t3 VALUES (1),(2),(3);
+SELECT LEFT(t2.a2, 1) FROM t2,t3 WHERE t3.a3=t2.a2;
+LEFT(t2.a2, 1)
+1
+2
+3
+SELECT t1.a1, t1.a1 in (SELECT t2.a2 FROM t2,t3 WHERE t3.a3=t2.a2) FROM t1;
+a1 t1.a1 in (SELECT t2.a2 FROM t2,t3 WHERE t3.a3=t2.a2)
+1 0
+2 0
+3 0
+4 0
+DROP TABLE t1,t2,t3;
+CREATE TABLE t1 (a1 BINARY(3) PRIMARY KEY, b1 VARBINARY(3));
+CREATE TABLE t2 (a2 VARBINARY(3) PRIMARY KEY);
+CREATE TABLE t3 (a3 VARBINARY(3) PRIMARY KEY);
+INSERT INTO t1 VALUES (1,10), (2,20), (3,30), (4,40);
+INSERT INTO t2 VALUES (2), (3), (4), (5);
+INSERT INTO t3 VALUES (10), (20), (30);
+SELECT LEFT(t1.a1,1) FROM t1,t3 WHERE t1.b1=t3.a3;
+LEFT(t1.a1,1)
+1
+2
+3
+SELECT a2 FROM t2 WHERE t2.a2 IN (SELECT t1.a1 FROM t1,t3 WHERE t1.b1=t3.a3);
+a2
+DROP TABLE t1, t2, t3;
End of 5.0 tests.
create table t_out (subcase char(3),
a1 char(2), b1 char(2), c1 char(2));
diff -Nrup a/mysql-test/r/subselect_no_semijoin.result b/mysql-test/r/subselect_no_semijoin.result
--- a/mysql-test/r/subselect_no_semijoin.result 2007-11-07 14:45:06 +04:00
+++ b/mysql-test/r/subselect_no_semijoin.result 2007-11-15 12:06:58 +04:00
@@ -4145,6 +4145,55 @@ SELECT ((a1,a2) IN (SELECT * FROM t2 WHE
0
0
DROP TABLE t1, t2;
+CREATE TABLE t1 (s1 BINARY(5), s2 VARBINARY(5));
+INSERT INTO t1 VALUES (0x41,0x41), (0x42,0x42), (0x43,0x43);
+SELECT s1, s2 FROM t1 WHERE s2 IN (SELECT s1 FROM t1);
+s1 s2
+SELECT s1, s2 FROM t1 WHERE (s2, 10) IN (SELECT s1, 10 FROM t1);
+s1 s2
+CREATE INDEX I1 ON t1 (s1);
+CREATE INDEX I2 ON t1 (s2);
+SELECT s1, s2 FROM t1 WHERE s2 IN (SELECT s1 FROM t1);
+s1 s2
+SELECT s1, s2 FROM t1 WHERE (s2, 10) IN (SELECT s1, 10 FROM t1);
+s1 s2
+TRUNCATE t1;
+INSERT INTO t1 VALUES (0x41,0x41);
+SELECT * FROM t1 WHERE s1 = (SELECT s2 FROM t1);
+s1 s2
+DROP TABLE t1;
+CREATE TABLE t1 (a1 VARBINARY(2) NOT NULL DEFAULT '0', PRIMARY KEY (a1));
+CREATE TABLE t2 (a2 BINARY(2) default '0', INDEX (a2));
+CREATE TABLE t3 (a3 BINARY(2) default '0');
+INSERT INTO t1 VALUES (1),(2),(3),(4);
+INSERT INTO t2 VALUES (1),(2),(3);
+INSERT INTO t3 VALUES (1),(2),(3);
+SELECT LEFT(t2.a2, 1) FROM t2,t3 WHERE t3.a3=t2.a2;
+LEFT(t2.a2, 1)
+1
+2
+3
+SELECT t1.a1, t1.a1 in (SELECT t2.a2 FROM t2,t3 WHERE t3.a3=t2.a2) FROM t1;
+a1 t1.a1 in (SELECT t2.a2 FROM t2,t3 WHERE t3.a3=t2.a2)
+1 0
+2 0
+3 0
+4 0
+DROP TABLE t1,t2,t3;
+CREATE TABLE t1 (a1 BINARY(3) PRIMARY KEY, b1 VARBINARY(3));
+CREATE TABLE t2 (a2 VARBINARY(3) PRIMARY KEY);
+CREATE TABLE t3 (a3 VARBINARY(3) PRIMARY KEY);
+INSERT INTO t1 VALUES (1,10), (2,20), (3,30), (4,40);
+INSERT INTO t2 VALUES (2), (3), (4), (5);
+INSERT INTO t3 VALUES (10), (20), (30);
+SELECT LEFT(t1.a1,1) FROM t1,t3 WHERE t1.b1=t3.a3;
+LEFT(t1.a1,1)
+1
+2
+3
+SELECT a2 FROM t2 WHERE t2.a2 IN (SELECT t1.a1 FROM t1,t3 WHERE t1.b1=t3.a3);
+a2
+DROP TABLE t1, t2, t3;
End of 5.0 tests.
create table t_out (subcase char(3),
a1 char(2), b1 char(2), c1 char(2));
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb__datadict.result b/mysql-test/suite/funcs_1/r/innodb__datadict.result
--- a/mysql-test/suite/funcs_1/r/innodb__datadict.result 2007-11-14 17:43:12 +04:00
+++ b/mysql-test/suite/funcs_1/r/innodb__datadict.result 2007-11-15 12:06:58 +04:00
@@ -2296,7 +2296,7 @@ NULL information_schema COLUMNS CHARACTE
NULL information_schema COLUMNS COLLATION_NAME 14 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema COLUMNS COLUMN_TYPE 15 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
NULL information_schema COLUMNS COLUMN_KEY 16 NO varchar 3 9 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
-NULL information_schema COLUMNS EXTRA 17 NO varchar 20 60 NULL NULL utf8 utf8_general_ci varchar(20) select Default Default
+NULL information_schema COLUMNS EXTRA 17 NO varchar 27 81 NULL NULL utf8 utf8_general_ci varchar(27) select Default Default
NULL information_schema COLUMNS PRIVILEGES 18 NO varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select Default Default
NULL information_schema COLUMNS COLUMN_COMMENT 19 NO varchar 1024 3072 NULL NULL utf8 utf8_general_ci varchar(1024) select Default Default
NULL information_schema COLUMNS STORAGE 20 NO varchar 8 24 NULL NULL utf8 utf8_general_ci varchar(8) select Default Default
@@ -8824,7 +8824,7 @@ COLUMNS CHARACTER_SET_NAME varchar(64)
COLUMNS COLLATION_NAME varchar(64)
COLUMNS COLUMN_TYPE longtext
COLUMNS COLUMN_KEY varchar(3)
-COLUMNS EXTRA varchar(20)
+COLUMNS EXTRA varchar(27)
COLUMNS PRIVILEGES varchar(80)
COLUMNS COLUMN_COMMENT varchar(1024)
COLUMNS STORAGE varchar(8)
@@ -10272,7 +10272,7 @@ CHARACTER_SET_NAME varchar(64) YES NULL
COLLATION_NAME varchar(64) YES NULL
COLUMN_TYPE longtext NO NULL
COLUMN_KEY varchar(3) NO
-EXTRA varchar(20) NO
+EXTRA varchar(27) NO
PRIVILEGES varchar(80) NO
COLUMN_COMMENT varchar(1024) NO
STORAGE varchar(8) NO
@@ -10296,7 +10296,7 @@ COLUMNS CREATE TEMPORARY TABLE `COLUMNS`
`COLLATION_NAME` varchar(64) DEFAULT NULL,
`COLUMN_TYPE` longtext NOT NULL,
`COLUMN_KEY` varchar(3) NOT NULL DEFAULT '',
- `EXTRA` varchar(20) NOT NULL DEFAULT '',
+ `EXTRA` varchar(27) NOT NULL DEFAULT '',
`PRIVILEGES` varchar(80) NOT NULL DEFAULT '',
`COLUMN_COMMENT` varchar(1024) NOT NULL DEFAULT '',
`STORAGE` varchar(8) NOT NULL DEFAULT '',
@@ -10329,7 +10329,7 @@ NULL information_schema columns CHARACTE
NULL information_schema columns COLLATION_NAME 14 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema columns COLUMN_TYPE 15 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
NULL information_schema columns COLUMN_KEY 16 NO varchar 3 9 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
-NULL information_schema columns EXTRA 17 NO varchar 20 60 NULL NULL utf8 utf8_general_ci varchar(20) select Default Default
+NULL information_schema columns EXTRA 17 NO varchar 27 81 NULL NULL utf8 utf8_general_ci varchar(27) select Default Default
NULL information_schema columns PRIVILEGES 18 NO varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select Default Default
NULL information_schema columns COLUMN_COMMENT 19 NO varchar 1024 3072 NULL NULL utf8 utf8_general_ci varchar(1024) select Default Default
NULL information_schema columns STORAGE 20 NO varchar 8 24 NULL NULL utf8 utf8_general_ci varchar(8) select Default Default
@@ -10386,7 +10386,7 @@ NULL information_schema COLUMNS CHARACTE
NULL information_schema COLUMNS COLLATION_NAME 14 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema COLUMNS COLUMN_TYPE 15 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
NULL information_schema COLUMNS COLUMN_KEY 16 NO varchar 3 9 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
-NULL information_schema COLUMNS EXTRA 17 NO varchar 20 60 NULL NULL utf8 utf8_general_ci varchar(20) select Default Default
+NULL information_schema COLUMNS EXTRA 17 NO varchar 27 81 NULL NULL utf8 utf8_general_ci varchar(27) select Default Default
NULL information_schema COLUMNS PRIVILEGES 18 NO varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select Default Default
NULL information_schema COLUMNS COLUMN_COMMENT 19 NO varchar 1024 3072 NULL NULL utf8 utf8_general_ci varchar(1024) select Default Default
NULL information_schema COLUMNS STORAGE 20 NO varchar 8 24 NULL NULL utf8 utf8_general_ci varchar(8) select Default Default
@@ -11255,7 +11255,7 @@ NULL information_schema COLUMNS CHARACTE
NULL information_schema COLUMNS COLLATION_NAME 14 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema COLUMNS COLUMN_TYPE 15 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
NULL information_schema COLUMNS COLUMN_KEY 16 NO varchar 3 9 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
-NULL information_schema COLUMNS EXTRA 17 NO varchar 20 60 NULL NULL utf8 utf8_general_ci varchar(20) select Default Default
+NULL information_schema COLUMNS EXTRA 17 NO varchar 27 81 NULL NULL utf8 utf8_general_ci varchar(27) select Default Default
NULL information_schema COLUMNS PRIVILEGES 18 NO varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select Default Default
NULL information_schema COLUMNS COLUMN_COMMENT 19 NO varchar 1024 3072 NULL NULL utf8 utf8_general_ci varchar(1024) select Default Default
NULL information_schema COLUMNS STORAGE 20 NO varchar 8 24 NULL NULL utf8 utf8_general_ci varchar(8) select Default Default
@@ -11851,7 +11851,7 @@ NULL information_schema COLUMNS CHARACTE
NULL information_schema COLUMNS COLLATION_NAME 14 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema COLUMNS COLUMN_TYPE 15 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
NULL information_schema COLUMNS COLUMN_KEY 16 NO varchar 3 9 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
-NULL information_schema COLUMNS EXTRA 17 NO varchar 20 60 NULL NULL utf8 utf8_general_ci varchar(20) select Default Default
+NULL information_schema COLUMNS EXTRA 17 NO varchar 27 81 NULL NULL utf8 utf8_general_ci varchar(27) select Default Default
NULL information_schema COLUMNS PRIVILEGES 18 NO varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select Default Default
NULL information_schema COLUMNS COLUMN_COMMENT 19 NO varchar 1024 3072 NULL NULL utf8 utf8_general_ci varchar(1024) select Default Default
NULL information_schema COLUMNS STORAGE 20 NO varchar 8 24 NULL NULL utf8 utf8_general_ci varchar(8) select Default Default
@@ -12545,7 +12545,7 @@ NULL information_schema COLUMNS NUMERIC_
3.0000 information_schema COLUMNS COLLATION_NAME varchar 64 192 utf8 utf8_general_ci varchar(64)
1.0000 information_schema COLUMNS COLUMN_TYPE longtext 4294967295 4294967295 utf8 utf8_general_ci longtext
3.0000 information_schema COLUMNS COLUMN_KEY varchar 3 9 utf8 utf8_general_ci varchar(3)
-3.0000 information_schema COLUMNS EXTRA varchar 20 60 utf8 utf8_general_ci varchar(20)
+3.0000 information_schema COLUMNS EXTRA varchar 27 81 utf8 utf8_general_ci varchar(27)
3.0000 information_schema COLUMNS PRIVILEGES varchar 80 240 utf8 utf8_general_ci varchar(80)
3.0000 information_schema COLUMNS COLUMN_COMMENT varchar 1024 3072 utf8 utf8_general_ci varchar(1024)
3.0000 information_schema COLUMNS STORAGE varchar 8 24 utf8 utf8_general_ci varchar(8)
diff -Nrup a/mysql-test/suite/funcs_1/r/memory__datadict.result b/mysql-test/suite/funcs_1/r/memory__datadict.result
--- a/mysql-test/suite/funcs_1/r/memory__datadict.result 2007-11-14 17:43:44 +04:00
+++ b/mysql-test/suite/funcs_1/r/memory__datadict.result 2007-11-15 12:06:58 +04:00
@@ -2294,7 +2294,7 @@ NULL information_schema COLUMNS CHARACTE
NULL information_schema COLUMNS COLLATION_NAME 14 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema COLUMNS COLUMN_TYPE 15 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
NULL information_schema COLUMNS COLUMN_KEY 16 NO varchar 3 9 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
-NULL information_schema COLUMNS EXTRA 17 NO varchar 20 60 NULL NULL utf8 utf8_general_ci varchar(20) select Default Default
+NULL information_schema COLUMNS EXTRA 17 NO varchar 27 81 NULL NULL utf8 utf8_general_ci varchar(27) select Default Default
NULL information_schema COLUMNS PRIVILEGES 18 NO varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select Default Default
NULL information_schema COLUMNS COLUMN_COMMENT 19 NO varchar 1024 3072 NULL NULL utf8 utf8_general_ci varchar(1024) select Default Default
NULL information_schema COLUMNS STORAGE 20 NO varchar 8 24 NULL NULL utf8 utf8_general_ci varchar(8) select Default Default
@@ -8807,7 +8807,7 @@ COLUMNS CHARACTER_SET_NAME varchar(64)
COLUMNS COLLATION_NAME varchar(64)
COLUMNS COLUMN_TYPE longtext
COLUMNS COLUMN_KEY varchar(3)
-COLUMNS EXTRA varchar(20)
+COLUMNS EXTRA varchar(27)
COLUMNS PRIVILEGES varchar(80)
COLUMNS COLUMN_COMMENT varchar(1024)
COLUMNS STORAGE varchar(8)
@@ -10240,7 +10240,7 @@ CHARACTER_SET_NAME varchar(64) YES NULL
COLLATION_NAME varchar(64) YES NULL
COLUMN_TYPE longtext NO NULL
COLUMN_KEY varchar(3) NO
-EXTRA varchar(20) NO
+EXTRA varchar(27) NO
PRIVILEGES varchar(80) NO
COLUMN_COMMENT varchar(1024) NO
STORAGE varchar(8) NO
@@ -10264,7 +10264,7 @@ COLUMNS CREATE TEMPORARY TABLE `COLUMNS`
`COLLATION_NAME` varchar(64) DEFAULT NULL,
`COLUMN_TYPE` longtext NOT NULL,
`COLUMN_KEY` varchar(3) NOT NULL DEFAULT '',
- `EXTRA` varchar(20) NOT NULL DEFAULT '',
+ `EXTRA` varchar(27) NOT NULL DEFAULT '',
`PRIVILEGES` varchar(80) NOT NULL DEFAULT '',
`COLUMN_COMMENT` varchar(1024) NOT NULL DEFAULT '',
`STORAGE` varchar(8) NOT NULL DEFAULT '',
@@ -10297,7 +10297,7 @@ NULL information_schema columns CHARACTE
NULL information_schema columns COLLATION_NAME 14 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema columns COLUMN_TYPE 15 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
NULL information_schema columns COLUMN_KEY 16 NO varchar 3 9 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
-NULL information_schema columns EXTRA 17 NO varchar 20 60 NULL NULL utf8 utf8_general_ci varchar(20) select Default Default
+NULL information_schema columns EXTRA 17 NO varchar 27 81 NULL NULL utf8 utf8_general_ci varchar(27) select Default Default
NULL information_schema columns PRIVILEGES 18 NO varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select Default Default
NULL information_schema columns COLUMN_COMMENT 19 NO varchar 1024 3072 NULL NULL utf8 utf8_general_ci varchar(1024) select Default Default
NULL information_schema columns STORAGE 20 NO varchar 8 24 NULL NULL utf8 utf8_general_ci varchar(8) select Default Default
@@ -10354,7 +10354,7 @@ NULL information_schema COLUMNS CHARACTE
NULL information_schema COLUMNS COLLATION_NAME 14 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema COLUMNS COLUMN_TYPE 15 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
NULL information_schema COLUMNS COLUMN_KEY 16 NO varchar 3 9 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
-NULL information_schema COLUMNS EXTRA 17 NO varchar 20 60 NULL NULL utf8 utf8_general_ci varchar(20) select Default Default
+NULL information_schema COLUMNS EXTRA 17 NO varchar 27 81 NULL NULL utf8 utf8_general_ci varchar(27) select Default Default
NULL information_schema COLUMNS PRIVILEGES 18 NO varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select Default Default
NULL information_schema COLUMNS COLUMN_COMMENT 19 NO varchar 1024 3072 NULL NULL utf8 utf8_general_ci varchar(1024) select Default Default
NULL information_schema COLUMNS STORAGE 20 NO varchar 8 24 NULL NULL utf8 utf8_general_ci varchar(8) select Default Default
@@ -11208,7 +11208,7 @@ NULL information_schema COLUMNS CHARACTE
NULL information_schema COLUMNS COLLATION_NAME 14 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema COLUMNS COLUMN_TYPE 15 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
NULL information_schema COLUMNS COLUMN_KEY 16 NO varchar 3 9 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
-NULL information_schema COLUMNS EXTRA 17 NO varchar 20 60 NULL NULL utf8 utf8_general_ci varchar(20) select Default Default
+NULL information_schema COLUMNS EXTRA 17 NO varchar 27 81 NULL NULL utf8 utf8_general_ci varchar(27) select Default Default
NULL information_schema COLUMNS PRIVILEGES 18 NO varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select Default Default
NULL information_schema COLUMNS COLUMN_COMMENT 19 NO varchar 1024 3072 NULL NULL utf8 utf8_general_ci varchar(1024) select Default Default
NULL information_schema COLUMNS STORAGE 20 NO varchar 8 24 NULL NULL utf8 utf8_general_ci varchar(8) select Default Default
@@ -11789,7 +11789,7 @@ NULL information_schema COLUMNS CHARACTE
NULL information_schema COLUMNS COLLATION_NAME 14 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema COLUMNS COLUMN_TYPE 15 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
NULL information_schema COLUMNS COLUMN_KEY 16 NO varchar 3 9 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
-NULL information_schema COLUMNS EXTRA 17 NO varchar 20 60 NULL NULL utf8 utf8_general_ci varchar(20) select Default Default
+NULL information_schema COLUMNS EXTRA 17 NO varchar 27 81 NULL NULL utf8 utf8_general_ci varchar(27) select Default Default
NULL information_schema COLUMNS PRIVILEGES 18 NO varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select Default Default
NULL information_schema COLUMNS COLUMN_COMMENT 19 NO varchar 1024 3072 NULL NULL utf8 utf8_general_ci varchar(1024) select Default Default
NULL information_schema COLUMNS STORAGE 20 NO varchar 8 24 NULL NULL utf8 utf8_general_ci varchar(8) select Default Default
@@ -12458,7 +12458,7 @@ NULL information_schema COLUMNS NUMERIC_
3.0000 information_schema COLUMNS COLLATION_NAME varchar 64 192 utf8 utf8_general_ci varchar(64)
1.0000 information_schema COLUMNS COLUMN_TYPE longtext 4294967295 4294967295 utf8 utf8_general_ci longtext
3.0000 information_schema COLUMNS COLUMN_KEY varchar 3 9 utf8 utf8_general_ci varchar(3)
-3.0000 information_schema COLUMNS EXTRA varchar 20 60 utf8 utf8_general_ci varchar(20)
+3.0000 information_schema COLUMNS EXTRA varchar 27 81 utf8 utf8_general_ci varchar(27)
3.0000 information_schema COLUMNS PRIVILEGES varchar 80 240 utf8 utf8_general_ci varchar(80)
3.0000 information_schema COLUMNS COLUMN_COMMENT varchar 1024 3072 utf8 utf8_general_ci varchar(1024)
3.0000 information_schema COLUMNS STORAGE varchar 8 24 utf8 utf8_general_ci varchar(8)
diff -Nrup a/mysql-test/suite/funcs_1/r/myisam__datadict.result b/mysql-test/suite/funcs_1/r/myisam__datadict.result
--- a/mysql-test/suite/funcs_1/r/myisam__datadict.result 2007-11-14 17:43:59 +04:00
+++ b/mysql-test/suite/funcs_1/r/myisam__datadict.result 2007-11-15 12:06:58 +04:00
@@ -2324,7 +2324,7 @@ NULL information_schema COLUMNS CHARACTE
NULL information_schema COLUMNS COLLATION_NAME 14 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema COLUMNS COLUMN_TYPE 15 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
NULL information_schema COLUMNS COLUMN_KEY 16 NO varchar 3 9 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
-NULL information_schema COLUMNS EXTRA 17 NO varchar 20 60 NULL NULL utf8 utf8_general_ci varchar(20) select Default Default
+NULL information_schema COLUMNS EXTRA 17 NO varchar 27 81 NULL NULL utf8 utf8_general_ci varchar(27) select Default Default
NULL information_schema COLUMNS PRIVILEGES 18 NO varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select Default Default
NULL information_schema COLUMNS COLUMN_COMMENT 19 NO varchar 1024 3072 NULL NULL utf8 utf8_general_ci varchar(1024) select Default Default
NULL information_schema COLUMNS STORAGE 20 NO varchar 8 24 NULL NULL utf8 utf8_general_ci varchar(8) select Default Default
@@ -8877,7 +8877,7 @@ COLUMNS CHARACTER_SET_NAME varchar(64)
COLUMNS COLLATION_NAME varchar(64)
COLUMNS COLUMN_TYPE longtext
COLUMNS COLUMN_KEY varchar(3)
-COLUMNS EXTRA varchar(20)
+COLUMNS EXTRA varchar(27)
COLUMNS PRIVILEGES varchar(80)
COLUMNS COLUMN_COMMENT varchar(1024)
COLUMNS STORAGE varchar(8)
@@ -10342,7 +10342,7 @@ CHARACTER_SET_NAME varchar(64) YES NULL
COLLATION_NAME varchar(64) YES NULL
COLUMN_TYPE longtext NO NULL
COLUMN_KEY varchar(3) NO
-EXTRA varchar(20) NO
+EXTRA varchar(27) NO
PRIVILEGES varchar(80) NO
COLUMN_COMMENT varchar(1024) NO
STORAGE varchar(8) NO
@@ -10366,7 +10366,7 @@ COLUMNS CREATE TEMPORARY TABLE `COLUMNS`
`COLLATION_NAME` varchar(64) DEFAULT NULL,
`COLUMN_TYPE` longtext NOT NULL,
`COLUMN_KEY` varchar(3) NOT NULL DEFAULT '',
- `EXTRA` varchar(20) NOT NULL DEFAULT '',
+ `EXTRA` varchar(27) NOT NULL DEFAULT '',
`PRIVILEGES` varchar(80) NOT NULL DEFAULT '',
`COLUMN_COMMENT` varchar(1024) NOT NULL DEFAULT '',
`STORAGE` varchar(8) NOT NULL DEFAULT '',
@@ -10399,7 +10399,7 @@ NULL information_schema columns CHARACTE
NULL information_schema columns COLLATION_NAME 14 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema columns COLUMN_TYPE 15 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
NULL information_schema columns COLUMN_KEY 16 NO varchar 3 9 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
-NULL information_schema columns EXTRA 17 NO varchar 20 60 NULL NULL utf8 utf8_general_ci varchar(20) select Default Default
+NULL information_schema columns EXTRA 17 NO varchar 27 81 NULL NULL utf8 utf8_general_ci varchar(27) select Default Default
NULL information_schema columns PRIVILEGES 18 NO varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select Default Default
NULL information_schema columns COLUMN_COMMENT 19 NO varchar 1024 3072 NULL NULL utf8 utf8_general_ci varchar(1024) select Default Default
NULL information_schema columns STORAGE 20 NO varchar 8 24 NULL NULL utf8 utf8_general_ci varchar(8) select Default Default
@@ -10456,7 +10456,7 @@ NULL information_schema COLUMNS CHARACTE
NULL information_schema COLUMNS COLLATION_NAME 14 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema COLUMNS COLUMN_TYPE 15 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
NULL information_schema COLUMNS COLUMN_KEY 16 NO varchar 3 9 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
-NULL information_schema COLUMNS EXTRA 17 NO varchar 20 60 NULL NULL utf8 utf8_general_ci varchar(20) select Default Default
+NULL information_schema COLUMNS EXTRA 17 NO varchar 27 81 NULL NULL utf8 utf8_general_ci varchar(27) select Default Default
NULL information_schema COLUMNS PRIVILEGES 18 NO varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select Default Default
NULL information_schema COLUMNS COLUMN_COMMENT 19 NO varchar 1024 3072 NULL NULL utf8 utf8_general_ci varchar(1024) select Default Default
NULL information_schema COLUMNS STORAGE 20 NO varchar 8 24 NULL NULL utf8 utf8_general_ci varchar(8) select Default Default
@@ -11350,7 +11350,7 @@ NULL information_schema COLUMNS CHARACTE
NULL information_schema COLUMNS COLLATION_NAME 14 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema COLUMNS COLUMN_TYPE 15 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
NULL information_schema COLUMNS COLUMN_KEY 16 NO varchar 3 9 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
-NULL information_schema COLUMNS EXTRA 17 NO varchar 20 60 NULL NULL utf8 utf8_general_ci varchar(20) select Default Default
+NULL information_schema COLUMNS EXTRA 17 NO varchar 27 81 NULL NULL utf8 utf8_general_ci varchar(27) select Default Default
NULL information_schema COLUMNS PRIVILEGES 18 NO varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select Default Default
NULL information_schema COLUMNS COLUMN_COMMENT 19 NO varchar 1024 3072 NULL NULL utf8 utf8_general_ci varchar(1024) select Default Default
NULL information_schema COLUMNS STORAGE 20 NO varchar 8 24 NULL NULL utf8 utf8_general_ci varchar(8) select Default Default
@@ -11963,7 +11963,7 @@ NULL information_schema COLUMNS CHARACTE
NULL information_schema COLUMNS COLLATION_NAME 14 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema COLUMNS COLUMN_TYPE 15 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
NULL information_schema COLUMNS COLUMN_KEY 16 NO varchar 3 9 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
-NULL information_schema COLUMNS EXTRA 17 NO varchar 20 60 NULL NULL utf8 utf8_general_ci varchar(20) select Default Default
+NULL information_schema COLUMNS EXTRA 17 NO varchar 27 81 NULL NULL utf8 utf8_general_ci varchar(27) select Default Default
NULL information_schema COLUMNS PRIVILEGES 18 NO varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select Default Default
NULL information_schema COLUMNS COLUMN_COMMENT 19 NO varchar 1024 3072 NULL NULL utf8 utf8_general_ci varchar(1024) select Default Default
NULL information_schema COLUMNS STORAGE 20 NO varchar 8 24 NULL NULL utf8 utf8_general_ci varchar(8) select Default Default
@@ -12672,7 +12672,7 @@ NULL information_schema COLUMNS NUMERIC_
3.0000 information_schema COLUMNS COLLATION_NAME varchar 64 192 utf8 utf8_general_ci varchar(64)
1.0000 information_schema COLUMNS COLUMN_TYPE longtext 4294967295 4294967295 utf8 utf8_general_ci longtext
3.0000 information_schema COLUMNS COLUMN_KEY varchar 3 9 utf8 utf8_general_ci varchar(3)
-3.0000 information_schema COLUMNS EXTRA varchar 20 60 utf8 utf8_general_ci varchar(20)
+3.0000 information_schema COLUMNS EXTRA varchar 27 81 utf8 utf8_general_ci varchar(27)
3.0000 information_schema COLUMNS PRIVILEGES varchar 80 240 utf8 utf8_general_ci varchar(80)
3.0000 information_schema COLUMNS COLUMN_COMMENT varchar 1024 3072 utf8 utf8_general_ci varchar(1024)
3.0000 information_schema COLUMNS STORAGE varchar 8 24 utf8 utf8_general_ci varchar(8)
diff -Nrup a/mysql-test/suite/funcs_1/t/disabled.def b/mysql-test/suite/funcs_1/t/disabled.def
--- a/mysql-test/suite/funcs_1/t/disabled.def 2007-10-10 23:02:28 +05:00
+++ b/mysql-test/suite/funcs_1/t/disabled.def 2007-11-15 12:06:58 +04:00
@@ -13,8 +13,4 @@
innodb_storedproc: (changes of WL#2984, using storeproc_nn instead)
memory_storedproc: (changes of WL#2984, using storeproc_nn instead)
myisam_storedproc: (changes of WL#2984, using storeproc_nn instead)
-innodb__datadict: 2007-10-10 mleich Bug#31509 funcs_1: <engine>__datadict tests broken, adjustment to 5.2 properties missing
-memory__datadict: 2007-10-10 mleich Bug#31509 funcs_1: <engine>__datadict tests broken, adjustment to 5.2 properties missing
-myisam__datadict: 2007-10-10 mleich Bug#31509 funcs_1: <engine>__datadict tests broken, adjustment to 5.2 properties missing
-ndb__datadict: 2007-10-10 mleich Bug#31509 funcs_1: <engine>__datadict tests broken, adjustment to 5.2 properties missing
ndb__datadict: 2007-10-08 mleich Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results
diff -Nrup a/mysql-test/suite/ndb/r/ndb_alter_table_online.result b/mysql-test/suite/ndb/r/ndb_alter_table_online.result
--- a/mysql-test/suite/ndb/r/ndb_alter_table_online.result 2007-11-14 17:44:51 +04:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_online.result 2007-11-15 12:06:58 +04:00
@@ -1,94 +1,143 @@
DROP TABLE IF EXISTS t1;
-CREATE TEMPORARY TABLE ndb_show_tables (id INT, type VARCHAR(20), state VARCHAR(20), logging VARCHAR(20), _database VARCHAR(255), _schema VARCHAR(20), name VARCHAR(255));
+*******************************
+* basic online alter tests
+*******************************
CREATE TABLE t1 (a INT UNSIGNED KEY, b INT UNSIGNED) ROW_FORMAT=DYNAMIC ENGINE NDB;
INSERT INTO t1 values (1,1);
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-set @t1_id = (select id from ndb_show_tables where name like '%t1%' and type like '%UserTable%');
-truncate ndb_show_tables;
+
+ndb_show_tables completed.....
+
+set @t1_id = (select id from ndb_show_tables_results where name like '%t1%' and type like '%UserTable%');
+truncate ndb_show_tables_results;
+*******************************
+* Alter Table online add column
+*******************************
+* Add column c as CHAR
+*******************************
ALTER TABLE t1 ADD c CHAR(19);
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-select name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+ndb_show_tables completed.....
+
+select name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
name
't1'
-truncate ndb_show_tables;
+truncate ndb_show_tables_results;
INSERT INTO t1 values (2,1,"a");
SELECT * FROM t1 ORDER BY a;
a b c
1 1 NULL
2 1 a
DROP TABLE t1;
+*******************************
+* Alter Table online add column
+*******************************
+* Add column c as nullable INT
+*******************************
CREATE TABLE t1 (a INT UNSIGNED KEY, b VARCHAR(19)) ENGINE NDB;
INSERT INTO t1 values (1,"a");
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-set @t1_id = (select id from ndb_show_tables where name like '%t1%' and type like '%UserTable%');
-truncate ndb_show_tables;
+
+ndb_show_tables completed.....
+
+set @t1_id = (select id from ndb_show_tables_results where name like '%t1%' and type like '%UserTable%');
+truncate ndb_show_tables_results;
ALTER TABLE t1 ADD c INT;
Warnings:
Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-select name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+ndb_show_tables completed.....
+
+select name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
name
't1'
-truncate ndb_show_tables;
+truncate ndb_show_tables_results;
INSERT INTO t1 values (2,"a",1);
SELECT * FROM t1 ORDER BY a;
a b c
1 a NULL
2 a 1
DROP TABLE t1;
+*******************************
+* Alter Table online add column
+*******************************
+* Add column c as nullable INT
+*******************************
CREATE TABLE t1 (a INT UNSIGNED KEY, b INT COLUMN_FORMAT DYNAMIC) ENGINE NDB;
INSERT INTO t1 values (1,1);
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-set @t1_id = (select id from ndb_show_tables where name like '%t1%' and type like '%UserTable%');
-truncate ndb_show_tables;
+
+ndb_show_tables completed.....
+
+set @t1_id = (select id from ndb_show_tables_results where name like '%t1%' and type like '%UserTable%');
+truncate ndb_show_tables_results;
ALTER TABLE t1 ADD c INT;
Warnings:
Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-select id,name from ndb_show_tables where id = @t1_id and name like '%t1%';
+
+ndb_show_tables completed.....
+
+select id,name from ndb_show_tables_results where id = @t1_id and name like '%t1%';
id name
5 't1'
-truncate ndb_show_tables;
+truncate ndb_show_tables_results;
INSERT INTO t1 values (2,1,1);
SELECT * FROM t1 ORDER BY a;
a b c
1 1 NULL
2 1 1
+*******************************
+* Create online Index ci
+*******************************
CREATE ONLINE INDEX ci on t1(c);
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-select id,name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+ndb_show_tables completed.....
+
+select id,name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
id name
5 't1'
-truncate ndb_show_tables;
+truncate ndb_show_tables_results;
+*******************************
+* Create offline Index ci2
+*******************************
CREATE OFFLINE INDEX ci2 on t1(c);
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-select id,name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+ndb_show_tables completed.....
+
+select id,name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
id name
-set @t1_id = (select id from ndb_show_tables where name like '%t1%' and type like '%UserTable%');
-truncate ndb_show_tables;
+set @t1_id = (select id from ndb_show_tables_results where name like '%t1%' and type like '%UserTable%');
+truncate ndb_show_tables_results;
+*******************************
+* Drop online Index ci
+*******************************
DROP ONLINE INDEX ci on t1;
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-select id,name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+ndb_show_tables completed.....
+
+select id,name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
id name
8 't1'
-truncate ndb_show_tables;
+truncate ndb_show_tables_results;
+*******************************
+* Drop offline Index ci2
+*******************************
DROP OFFLINE INDEX ci2 on t1;
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-select id,name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+ndb_show_tables completed.....
+
+select id,name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
id name
-truncate ndb_show_tables;
+truncate ndb_show_tables_results;
DROP TABLE t1;
+*******************************
+* basic concurent online alter test
+*******************************
+* With Commit
+*******************************
CREATE TABLE t1 (a INT UNSIGNED KEY, b INT UNSIGNED) ENGINE NDB;
-insert into t1 values (1,1);
-insert into t1 values (2,2);
-insert into t1 values (3,3);
-insert into t1 values (4,4);
begin;
update t1 set b = 0 where a = 1;
update t1 set b = 1 where a = 2;
delete from t1 where a = 3;
-insert into t1 values (5,5);
-insert into t1 values (6,6);
+insert into t1 values (5,5),(6,6);
update t1 set b = 0 where a = 6;
ALTER TABLE t1 ADD c CHAR(19), ADD d VARCHAR(255), ADD e char(255);
Warnings:
@@ -98,8 +147,7 @@ Warning 1478 Converted FIXED field to DY
update t1 set b = 0 where a = 2;
update t1 set b = 0 where a = 4;
update t1 set b = 0 where a = 5;
-insert into t1 values (7,0,null,null,null);
-insert into t1 values (8,0,'8','8','8');
+insert into t1 values (7,0,null,null,null),(8,0,'8','8','8');
commit;
SELECT * FROM t1 ORDER BY a;
a b c d e
@@ -111,17 +159,17 @@ a b c d e
7 0 NULL NULL NULL
8 0 8 8 8
DROP TABLE t1;
+*******************************
+* basic concurent online alter test
+*******************************
+* With Rollback
+*******************************
CREATE TABLE t1 (a INT UNSIGNED KEY, b INT UNSIGNED) ENGINE NDB;
-INSERT INTO t1 values (1,1);
-insert into t1 values (2,2);
-insert into t1 values (3,3);
-insert into t1 values (4,4);
begin;
update t1 set b = 0 where a = 1;
update t1 set b = 1 where a = 2;
delete from t1 where a = 3;
-insert into t1 values (5,5);
-insert into t1 values (6,6);
+insert into t1 values (5,5),(6,6);
update t1 set b = 0 where a = 6;
ALTER TABLE t1 ADD c CHAR(19), ADD d VARCHAR(255), ADD e char(255);
Warnings:
@@ -131,8 +179,7 @@ Warning 1478 Converted FIXED field to DY
update t1 set b = 0 where a = 2;
update t1 set b = 0 where a = 4;
update t1 set b = 0 where a = 5;
-insert into t1 values (7,0,null,null,null);
-insert into t1 values (8,0,'8','8','8');
+insert into t1 values (7,0,null,null,null),(8,0,'8','8','8');
rollback;
SELECT * FROM t1 ORDER BY a;
a b c d e
@@ -141,112 +188,175 @@ a b c d e
3 3 NULL NULL NULL
4 4 NULL NULL NULL
DROP TABLE t1;
+*******************************
+* The following ALTER operations are not supported on-line
+*******************************
+* Not supported Test#1
+*******************************
CREATE TABLE t1 (a INT UNSIGNED KEY, b INT UNSIGNED) ROW_FORMAT=FIXED ENGINE NDB;
INSERT INTO t1 values (1,1);
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-set @t1_id = (select id from ndb_show_tables where name like '%t1%' and type like '%UserTable%');
-truncate ndb_show_tables;
+
+ndb_show_tables completed.....
+
+set @t1_id = (select id from ndb_show_tables_results where name like '%t1%' and type like '%UserTable%');
+truncate ndb_show_tables_results;
ALTER ONLINE TABLE t1 ADD c CHAR(19);
ERROR 42000: This version of MySQL doesn't yet support 'ALTER ONLINE TABLE t1 ADD c CHAR(19)'
-ALTER TABLE t1 ADD c CHAR(19);
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-select name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+ndb_show_tables completed.....
+
+select name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
name
-truncate ndb_show_tables;
+'t1'
+truncate ndb_show_tables_results;
+ALTER TABLE t1 ADD c CHAR(19);
INSERT INTO t1 values (2,1,"a");
SELECT * FROM t1 ORDER BY a;
a b c
1 1 NULL
2 1 a
DROP TABLE t1;
+*******************************
+* Not supported Test#2
+*******************************
CREATE TABLE t1 (a INT UNSIGNED KEY, b INT UNSIGNED) ROW_FORMAT=DYNAMIC ENGINE NDB;
INSERT INTO t1 values (1,1);
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-set @t1_id = (select id from ndb_show_tables where name like '%t1%' and type like '%UserTable%');
-truncate ndb_show_tables;
+
+ndb_show_tables completed.....
+
+set @t1_id = (select id from ndb_show_tables_results where name like '%t1%' and type like '%UserTable%');
+truncate ndb_show_tables_results;
ALTER ONLINE TABLE t1 ADD c CHAR(19) DEFAULT 17;
ERROR 42000: This version of MySQL doesn't yet support 'ALTER ONLINE TABLE t1 ADD c CHAR(19) DEFAULT 17'
-ALTER TABLE t1 ADD c CHAR(19) DEFAULT 17;
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-select name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+ndb_show_tables completed.....
+
+select name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
name
-truncate ndb_show_tables;
+'t1'
+truncate ndb_show_tables_results;
+ALTER TABLE t1 ADD c CHAR(19) DEFAULT 17;
INSERT INTO t1 values (2,1,"a");
SELECT * FROM t1 ORDER BY a;
a b c
1 1 17
2 1 a
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-set @t1_id = (select id from ndb_show_tables where name like '%t1%' and type like '%UserTable%');
-truncate ndb_show_tables;
+*******************************
+* Not supported Test#3
+*******************************
+
+ndb_show_tables completed.....
+
+set @t1_id = (select id from ndb_show_tables_results where name like '%t1%' and type like '%UserTable%');
+truncate ndb_show_tables_results;
ALTER ONLINE TABLE t1 ADD d INT AFTER b;
ERROR 42000: This version of MySQL doesn't yet support 'ALTER ONLINE TABLE t1 ADD d INT AFTER b'
-ALTER TABLE t1 ADD d INT AFTER b;
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-select name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+ndb_show_tables completed.....
+
+select name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
name
-truncate ndb_show_tables;
+'t1'
+truncate ndb_show_tables_results;
+ALTER TABLE t1 ADD d INT AFTER b;
SELECT * FROM t1 ORDER BY a;
a b d c
1 1 NULL 17
2 1 NULL a
+*******************************
+* Not supported Test#4
+*******************************
ALTER ONLINE TABLE t1 ENGINE MYISAM;
ERROR 42000: This version of MySQL doesn't yet support 'ALTER ONLINE TABLE t1 ENGINE MYISAM'
+
+ndb_show_tables completed.....
+
+select name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+name
+truncate ndb_show_tables_results;
DROP TABLE t1;
+*******************************
+* Not supported Test#5
+*******************************
CREATE TABLE t1 (a INT UNSIGNED KEY, b INT UNSIGNED) ROW_FORMAT=DYNAMIC ENGINE NDB;
INSERT INTO t1 values (1,1);
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-set @t1_id = (select id from ndb_show_tables where name like '%t1%' and type like '%UserTable%');
-truncate ndb_show_tables;
+
+ndb_show_tables completed.....
+
+set @t1_id = (select id from ndb_show_tables_results where name like '%t1%' and type like '%UserTable%');
+truncate ndb_show_tables_results;
ALTER ONLINE TABLE t1 ADD c TIMESTAMP;
ERROR 42000: This version of MySQL doesn't yet support 'ALTER ONLINE TABLE t1 ADD c TIMESTAMP'
-ALTER TABLE t1 ADD c TIMESTAMP;
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-select name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+ndb_show_tables completed.....
+
+select name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
name
-truncate ndb_show_tables;
+'t1'
+truncate ndb_show_tables_results;
+ALTER TABLE t1 ADD c TIMESTAMP;
INSERT INTO t1 values (2,2,'2007-09-19 18:46:02');
SELECT * FROM t1 ORDER BY a;
a b c
1 1 0000-00-00 00:00:00
2 2 2007-09-19 18:46:02
DROP TABLE t1;
+*******************************
+* Not supported Test#6
+*******************************
CREATE TABLE t1 (a INT UNSIGNED KEY, b INT UNSIGNED) ROW_FORMAT=DYNAMIC ENGINE NDB;
INSERT INTO t1 values (1,1);
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-set @t1_id = (select id from ndb_show_tables where name like '%t1%' and type like '%UserTable%');
-truncate ndb_show_tables;
+
+ndb_show_tables completed.....
+
+set @t1_id = (select id from ndb_show_tables_results where name like '%t1%' and type like '%UserTable%');
+truncate ndb_show_tables_results;
ALTER ONLINE TABLE t1 ADD c CHAR(19) NOT NULL;
ERROR 42000: This version of MySQL doesn't yet support 'ALTER ONLINE TABLE t1 ADD c CHAR(19) NOT NULL'
-ALTER TABLE t1 ADD c CHAR(19) NOT NULL;
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-select name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+ndb_show_tables completed.....
+
+select name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
name
-truncate ndb_show_tables;
+'t1'
+truncate ndb_show_tables_results;
+ALTER TABLE t1 ADD c CHAR(19) NOT NULL;
INSERT INTO t1 values (2,1,"a");
SELECT * FROM t1 ORDER BY a;
a b c
1 1
2 1 a
DROP TABLE t1;
+*******************************
+* Not supported Test#7
+*******************************
CREATE TABLE t1 (a INT UNSIGNED KEY, b INT UNSIGNED) ROW_FORMAT=DYNAMIC ENGINE NDB;
INSERT INTO t1 values (1,1);
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-set @t1_id = (select id from ndb_show_tables where name like '%t1%' and type like '%UserTable%');
-truncate ndb_show_tables;
+
+ndb_show_tables completed.....
+
+set @t1_id = (select id from ndb_show_tables_results where name like '%t1%' and type like '%UserTable%');
+truncate ndb_show_tables_results;
ALTER ONLINE TABLE t1 ADD c CHAR(19) COLUMN_FORMAT FIXED;
ERROR 42000: This version of MySQL doesn't yet support 'ALTER ONLINE TABLE t1 ADD c CHAR(19) COLUMN_FORMAT FIXED'
-ALTER TABLE t1 ADD c CHAR(19) COLUMN_FORMAT FIXED;
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-select name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+ndb_show_tables completed.....
+
+select name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
name
-truncate ndb_show_tables;
+'t1'
+truncate ndb_show_tables_results;
+ALTER TABLE t1 ADD c CHAR(19) COLUMN_FORMAT FIXED;
INSERT INTO t1 values (2,1,"a");
SELECT * FROM t1 ORDER BY a;
a b c
1 1 NULL
2 1 a
DROP TABLE t1;
+*******************************
+* Not supported Test#8
+* Ndb doesn't support renaming attributes on-line
+*******************************
CREATE TABLE t1 (
auto int(5) unsigned NOT NULL auto_increment,
string char(10),
@@ -276,23 +386,216 @@ date_time datetime,
time_stamp timestamp,
PRIMARY KEY (auto)
) engine=ndb;
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-set @t1_id = (select id from ndb_show_tables where name like '%t1%' and type like '%UserTable%');
-truncate ndb_show_tables;
+
+ndb_show_tables completed.....
+
+set @t1_id = (select id from ndb_show_tables_results where name like '%t1%' and type like '%UserTable%');
+truncate ndb_show_tables_results;
alter online table t1 change tiny new_tiny tinyint(4) DEFAULT '0' NOT NULL;
ERROR 42000: This version of MySQL doesn't yet support 'alter online table t1 change tiny new_tiny tinyint(4) DEFAULT '0' NOT NULL'
-alter table t1 change tiny new_tiny tinyint(4) DEFAULT '0' NOT NULL;
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-select name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+ndb_show_tables completed.....
+
+select name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
name
-set @t1_id = (select id from ndb_show_tables where name like '%t1%' and type like '%UserTable%');
-truncate ndb_show_tables;
+'t1'
+truncate ndb_show_tables_results;
+alter table t1 change tiny new_tiny tinyint(4) DEFAULT '0' NOT NULL;
create index i1 on t1(medium);
alter table t1 add index i2(new_tiny);
drop index i1 on t1;
-LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-select name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+ndb_show_tables completed.....
+
+select name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+name
+truncate ndb_show_tables_results;
+DROP TABLE t1;
+*******************************
+* Add column c as nullable TEXT
+*******************************
+CREATE TABLE t1 (a INT UNSIGNED AUTO_INCREMENT KEY, b INT DEFAULT 2 COLUMN_FORMAT DYNAMIC) ENGINE NDB;
+
+ndb_show_tables completed.....
+
+set @t1_id = (select id from ndb_show_tables_results where name like '%t1%' and type like '%UserTable%');
+truncate ndb_show_tables_results;
+ALTER ONLINE TABLE t1 ADD c TEXT;
+ERROR 42000: This version of MySQL doesn't yet support 'ALTER ONLINE TABLE t1 ADD c TEXT'
+
+ndb_show_tables completed.....
+
+select name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+name
+'t1'
+truncate ndb_show_tables_results;
+DROP TABLE t1;
+CREATE TABLE t1 (a INT UNSIGNED AUTO_INCREMENT KEY, b INT COLUMN_FORMAT DYNAMIC) ENGINE NDB;
+
+ndb_show_tables completed.....
+
+set @t1_id = (select id from ndb_show_tables_results where name like '%t1%' and type like '%UserTable%');
+truncate ndb_show_tables_results;
+*******************************
+* Add column c as nullable FLOAT
+*******************************
+ALTER ONLINE TABLE t1 ADD c FLOAT;
+Warnings:
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+*******************************
+* Add column d as nullable DOUBLE
+*******************************
+ALTER ONLINE TABLE t1 ADD d DOUBLE UNSIGNED;
+Warnings:
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+*******************************
+* Add column e as nullable DECIMAL
+*******************************
+ALTER ONLINE TABLE t1 ADD e DECIMAL(5,2);
+Warnings:
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+*******************************
+* Add column f as nullable DATETIME
+*******************************
+ALTER ONLINE TABLE t1 ADD f DATETIME;
+Warnings:
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+*******************************
+* Add column g as nullable BINARY
+*******************************
+ALTER TABLE t1 ADD g BINARY(4);
+Warnings:
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+
+ndb_show_tables completed.....
+
+select name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
name
't1'
+truncate ndb_show_tables_results;
+SELECT COUNT(*) FROM t1 WHERE c IS NULL;
+COUNT(*)
+5
+SELECT COUNT(*) FROM t1 WHERE d IS NULL;
+COUNT(*)
+10
+SELECT COUNT(*) FROM t1 WHERE e IS NULL;
+COUNT(*)
+15
+SELECT COUNT(*) FROM t1 WHERE f IS NULL;
+COUNT(*)
+20
+SELECT COUNT(*) FROM t1 WHERE g IS NULL;
+COUNT(*)
+25
+*********************************
+* Backup and restore tables w/ new column
+*********************************
+CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
+DELETE FROM test.backup_info;
+LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
+SELECT @the_backup_id:=backup_id FROM test.backup_info;
+@the_backup_id:=backup_id
+<the_backup_id>
+DROP TABLE test.backup_info;
+DROP TABLE t1;
+ForceVarPart: 1
+DROP TABLE t1;
+*********************************
+* Disk Data error testing
+*********************************
+set storage_engine=ndb;
+CREATE LOGFILE GROUP lg1
+ADD UNDOFILE 'undofile.dat'
+INITIAL_SIZE 16M
+UNDO_BUFFER_SIZE = 1M;
+CREATE TABLESPACE ts1
+ADD DATAFILE 'datafile.dat'
+USE LOGFILE GROUP lg1
+INITIAL_SIZE 12M
+ENGINE NDB;
+CREATE TABLE t1
+(pk1 INT NOT NULL PRIMARY KEY, b INT COLUMN_FORMAT DYNAMIC)
+TABLESPACE ts1 STORAGE DISK
+ENGINE=NDB;
+Warnings:
+Warning 1478 DYNAMIC column b with STORAGE DISK is not supported, column will become FIXED
+ALTER ONLINE TABLE t1 CHANGE b b_1 INT COLUMN_FORMAT DYNAMIC;
+ERROR 42000: This version of MySQL doesn't yet support 'ALTER ONLINE TABLE t1 CHANGE b b_1 INT COLUMN_FORMAT DYNAMIC'
+DROP TABLE t1;
+ALTER TABLESPACE ts1
+DROP DATAFILE 'datafile.dat'
+ENGINE = NDB;
+DROP TABLESPACE ts1
+ENGINE = NDB;
+DROP LOGFILE GROUP lg1
+ENGINE =NDB;
+********************
+* ROW_FORMAT testing
+********************
+CREATE TABLE t1
+(pk1 INT NOT NULL PRIMARY KEY, b INT COLUMN_FORMAT DYNAMIC)ROW_FORMAT=FIXED
+ENGINE=NDB;
+Warnings:
+Warning 1478 Row format FIXED incompatible with dynamic attribute b
+-- t1 --
+Version: #
+Fragment type: 5
+K Value: 6
+Min load factor: 78
+Max load factor: 80
+Temporary table: no
+Number of attributes: 2
+Number of primary keys: 1
+Length of frm data: 255
+Row Checksum: 1
+Row GCI: 1
+SingleUserMode: 0
+ForceVarPart: 0
+TableStatus: Retrieved
+-- Attributes --
+pk1 Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+b Int NULL AT=FIXED ST=MEMORY DYNAMIC
+
+-- Indexes --
+PRIMARY KEY(pk1) - UniqueHashIndex
+PRIMARY(pk1) - OrderedIndex
+
+
+NDBT_ProgramExit: 0 - OK
+
+DROP TABLE t1;
+CREATE TABLE t1
+(pk1 INT NOT NULL COLUMN_FORMAT FIXED PRIMARY KEY,
+b INT COLUMN_FORMAT FIXED)ROW_FORMAT=DYNAMIC ENGINE=NDB;
+-- t1 --
+Version: #
+Fragment type: 5
+K Value: 6
+Min load factor: 78
+Max load factor: 80
+Temporary table: no
+Number of attributes: 2
+Number of primary keys: 1
+Length of frm data: 255
+Row Checksum: 1
+Row GCI: 1
+SingleUserMode: 0
+ForceVarPart: 1
+TableStatus: Retrieved
+-- Attributes --
+pk1 Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+b Int NULL AT=FIXED ST=MEMORY
+
+-- Indexes --
+PRIMARY KEY(pk1) - UniqueHashIndex
+PRIMARY(pk1) - OrderedIndex
+
+
+NDBT_ProgramExit: 0 - OK
+
+********************
+* Cleanup Section
+********************
DROP TABLE t1;
-DROP TABLE ndb_show_tables;
+DROP TABLE ndb_show_tables_results;
diff -Nrup a/mysql-test/suite/ndb/r/ndb_alter_table_online2.result b/mysql-test/suite/ndb/r/ndb_alter_table_online2.result
--- a/mysql-test/suite/ndb/r/ndb_alter_table_online2.result 2007-11-14 17:48:12 +04:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_online2.result 2007-11-15 12:06:58 +04:00
@@ -1,13 +1,96 @@
DROP TABLE IF EXISTS t1;
CREATE DATABASE IF NOT EXISTS mysqlslap;
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ basic online alter test during load
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
create table t1 (pk int key, a int) engine ndb;
insert into t1 values (1,0);
-alter table t1 add b int;
+
+ndb_show_tables completed.....
+
+set @t1_id = (select id from ndb_show_tables_results where name like '%t1%' and type like '%UserTable%');
+truncate ndb_show_tables_results;
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ Starting mysqlslap
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ Alter table t1 add column b
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ALTER ONLINE TABLE t1 ADD b INT;
Warnings:
Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ Check table t1 ID has not changed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+ndb_show_tables completed.....
+
+select name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+name
+'t1'
+truncate ndb_show_tables_results;
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ Starting mysqlslap using column b
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
update t1 set b= 0;
-alter table t1 add c int;
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ Alter table t1 add column c
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ALTER ONLINE TABLE t1 ADD c INT;
Warnings:
Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ Check table t1 ID has not changed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+ndb_show_tables completed.....
+
+select name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+name
+'t1'
+truncate ndb_show_tables_results;
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ Starting mysqlslap using column c
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
update t1 set c= 0;
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ Alter table t1 and try to add partitions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ALTER ONLINE TABLE t1 PARTITION BY HASH(pk);
+ERROR 42000: This version of MySQL doesn't yet support 'ALTER ONLINE TABLE t1 PARTITION BY HASH(pk)'
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ Check table t1 ID has not changed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+ndb_show_tables completed.....
+
+select name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+name
+'t1'
+truncate ndb_show_tables_results;
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ cleanup section
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
drop table t1;
diff -Nrup a/mysql-test/suite/ndb/r/ndb_dd_basic.result b/mysql-test/suite/ndb/r/ndb_dd_basic.result
--- a/mysql-test/suite/ndb/r/ndb_dd_basic.result 2007-11-14 17:50:39 +04:00
+++ b/mysql-test/suite/ndb/r/ndb_dd_basic.result 2007-11-15 12:06:58 +04:00
@@ -7,21 +7,17 @@ ADD UNDOFILE 'undofile.dat'
INITIAL_SIZE 16M
UNDO_BUFFER_SIZE = 1M
ENGINE=MYISAM;
-Warnings:
-Error 1478 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
+ERROR HY000: Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
ALTER LOGFILE GROUP lg1
ADD UNDOFILE 'undofile02.dat'
INITIAL_SIZE = 4M
ENGINE=XYZ;
-Warnings:
-Warning 1286 Unknown table engine 'XYZ'
-Error 1478 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
+ERROR HY000: Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat'
USE LOGFILE GROUP lg1
INITIAL_SIZE 12M;
-Warnings:
-Error 1478 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
+ERROR HY000: Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
set storage_engine=ndb;
CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat'
diff -Nrup a/mysql-test/suite/ndb/t/ndb_dd_basic.test b/mysql-test/suite/ndb/t/ndb_dd_basic.test
--- a/mysql-test/suite/ndb/t/ndb_dd_basic.test 2007-11-01 10:20:14 +04:00
+++ b/mysql-test/suite/ndb/t/ndb_dd_basic.test 2007-11-15 12:06:58 +04:00
@@ -25,20 +25,20 @@ DROP TABLE IF EXISTS t1;
--enable_warnings
# some negative tests
---error 1477
+--error 1478
CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat'
INITIAL_SIZE 16M
UNDO_BUFFER_SIZE = 1M
ENGINE=MYISAM;
---error 1477
+--error 1478
ALTER LOGFILE GROUP lg1
ADD UNDOFILE 'undofile02.dat'
INITIAL_SIZE = 4M
ENGINE=XYZ;
---error 1477
+--error 1478
CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat'
USE LOGFILE GROUP lg1
diff -Nrup a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc 2007-11-14 17:53:14 +04:00
+++ b/sql/sql_show.cc 2007-11-15 12:06:58 +04:00
@@ -3903,7 +3903,7 @@ static int get_schema_column_record(THD
end= tmp;
if (field->unireg_check == Field::NEXT_NUMBER)
table->field[16]->store(STRING_WITH_LEN("auto_increment"), cs);
- if (show_table->timestamp_field == field &&
+ if (timestamp_field == field &&
field->unireg_check != Field::TIMESTAMP_DN_FIELD)
table->field[16]->store(STRING_WITH_LEN("on update CURRENT_TIMESTAMP"),
cs);
| Thread |
|---|
| • bk commit into 6.0 tree (gluh:1.2666) | gluh | 15 Nov |
