diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-03-01 10:48:15 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-03-01 10:48:15 +0100 |
| commit | cc5056c514fdd9e6710cdc98d371ba193ed1cab2 (patch) | |
| tree | f195c703ca56d120a95c4e55abe7a1ec205eccf5 /mysql-test | |
| parent | ee9930bfa4c6cbdd15438f22dccc3a4a2c232d36 (diff) | |
| parent | 409f02299f73bdc5665985cc1bcdbddc9d9a6313 (diff) | |
| download | mariadb-git-cc5056c514fdd9e6710cdc98d371ba193ed1cab2.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ndb_partition_range.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 8 | ||||
| -rw-r--r-- | mysql-test/t/ndb_partition_range.test | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/mysql-test/r/ndb_partition_range.result b/mysql-test/r/ndb_partition_range.result index e078f38c166..546c0b1196c 100644 --- a/mysql-test/r/ndb_partition_range.result +++ b/mysql-test/r/ndb_partition_range.result @@ -159,13 +159,15 @@ a2 TEXT NOT NULL, a3 BIT NOT NULL, a4 DECIMAL(8,3), a5 INT NOT NULL, -a6 VARCHAR(255), +a6 INT, PRIMARY KEY(a1)) TABLESPACE ts1 STORAGE DISK ENGINE=NDB PARTITION BY LIST (a1) (PARTITION p0 VALUES IN (1,2,3,4,5), PARTITION p1 VALUES IN (6,7,8,9, 10), PARTITION p2 VALUES IN (11, 12, 13, 14, 15)); +ALTER TABLE test.t1 DROP COLUMN a6; +ALTER TABLE test.t1 ADD COLUMN a6 VARCHAR(255); SELECT COUNT(*) FROM test.t1; COUNT(*) 15 diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 6e8314860a3..c32750d89e4 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -22,16 +22,16 @@ partition_03ndb : Bug#16385 ps_7ndb : dbug assert in RBR mode when executing test suite #rpl_bit_npk : Bug#13418 rpl_ddl : Bug#15963 SBR does not show "Definer" correctly -rpl_ndb_2innodb : Bugs#17400, 17687, 17701 -rpl_ndb_2myisam : Bugs#17400, 17687, 17701 +rpl_ndb_2innodb : Bugs#17400: delete & update of rows in table without pk fails +rpl_ndb_2myisam : Bugs#17400: delete & update of rows in table without pk fails rpl_ndb_auto_inc : Bug#17086 rpl_ndb_basic : Bug#16228 [IN REVIEW] rpl_ndb_charset : Bug#17246 rpl_ndb_ddl : Bug#17400: delete & update of rows in table without pk fails rpl_ndb_delete_nowhere : Bug#17400: delete & update of rows in table without pk fails -rpl_ndb_innodb2ndb : Bugs#17400, 17687, 17701 +rpl_ndb_innodb2ndb : Bugs#17400: delete & update of rows in table without pk fails rpl_ndb_insert_ignore : Bugs: #17431: INSERT IGNORE INTO returns failed: 1296 -rpl_ndb_myisam2ndb : Bugs#17400, 17687, 17701 +rpl_ndb_myisam2ndb : Bugs#17400: delete & update of rows in table without pk fails rpl_ndb_log : result not deterministic rpl_ndb_relay_space : Bug#16993 rpl_ndb_multi_update3 : Bug#17400: delete & update of rows in table without pk fails diff --git a/mysql-test/t/ndb_partition_range.test b/mysql-test/t/ndb_partition_range.test index 66235b0e9eb..5b70b26c97b 100644 --- a/mysql-test/t/ndb_partition_range.test +++ b/mysql-test/t/ndb_partition_range.test @@ -140,7 +140,7 @@ CREATE TABLE test.t1 ( a3 BIT NOT NULL, a4 DECIMAL(8,3), a5 INT NOT NULL, - a6 VARCHAR(255), + a6 INT, PRIMARY KEY(a1)) TABLESPACE ts1 STORAGE DISK ENGINE=NDB PARTITION BY LIST (a1) @@ -148,6 +148,10 @@ CREATE TABLE test.t1 ( PARTITION p1 VALUES IN (6,7,8,9, 10), PARTITION p2 VALUES IN (11, 12, 13, 14, 15)); +# Alter table directly without any statements inbetween +ALTER TABLE test.t1 DROP COLUMN a6; +ALTER TABLE test.t1 ADD COLUMN a6 VARCHAR(255); + let $j= 15; --disable_query_log while ($j) |