3353 Martin Skold 2011-06-08
Fixed incorrect test cases
modified:
mysql-test/suite/ndb/r/ndb_dd_alter.result
mysql-test/suite/ndb/r/ndb_dd_disk2memory.result
mysql-test/suite/ndb/r/ndb_index_unique.result
mysql-test/suite/ndb/t/disabled.def
mysql-test/suite/ndb/t/ndb_index_unique.test
3352 Martin Skold 2011-06-08
Removed incorrect error check, TABLESPACE is allowed for memory tables, but have no effect
modified:
sql/ha_ndbcluster.cc
3351 magnus.blaudd@stripped 2011-06-01
ndb
- change tree name to 5.5-cluster-alter
modified:
.bzr-mysql/default.conf
=== modified file 'mysql-test/suite/ndb/r/ndb_dd_alter.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_alter.result 2010-11-30 10:44:15 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_alter.result 2011-06-08 12:00:29 +0000
@@ -225,7 +225,7 @@ t1 CREATE TABLE `t1` (
`a9` varchar(255) DEFAULT NULL,
`a10` blob,
PRIMARY KEY (`a1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=InnoDB DEFAULT CHARSET=latin1
SELECT * FROM test.t1 ORDER BY a1;
a1 a2 a3 a4 a5 a6 a7 a8 a9 a10
1 2 2000000001 aaa1 34.2 04:03:02 2006-01-01 1971-05-28 16:55:03 bbbbbbbbbbbbb1 binary data
@@ -290,7 +290,7 @@ t1 CREATE TABLE `t1` (
`a9` varchar(255) DEFAULT NULL,
`a10` blob,
PRIMARY KEY (`a1`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE test.t1;
CREATE TABLE test.t1 (a1 INT PRIMARY KEY) TABLESPACE ts STORAGE DISK ENGINE=NDB;
SELECT * FROM test.t1 ORDER BY a1;
@@ -317,11 +317,11 @@ a1
20
SELECT * FROM information_schema.partitions WHERE table_name= 't1' AND partition_name = 'p0';
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_ORDINAL_POSITION SUBPARTITION_ORDINAL_POSITION PARTITION_METHOD SUBPARTITION_METHOD PARTITION_EXPRESSION SUBPARTITION_EXPRESSION PARTITION_DESCRIPTION TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE CREATE_TIME UPDATE_TIME CHECK_TIME CHECKSUM PARTITION_COMMENT NODEGROUP TABLESPACE_NAME
-NULL test t1 p0 NULL 1 NULL KEY NULL NULL NULL 0 0 0 NULL 0 0 NULL NULL NULL NULL default ts
+def test t1 p0 NULL 1 NULL KEY NULL NULL NULL 0 0 0 NULL 0 0 NULL NULL NULL NULL default ts
ALTER TABLE test.t1 ADD a2 FLOAT, ADD a3 DOUBLE;
SELECT * FROM information_schema.partitions WHERE table_name= 't1' AND partition_name = 'p0';
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_ORDINAL_POSITION SUBPARTITION_ORDINAL_POSITION PARTITION_METHOD SUBPARTITION_METHOD PARTITION_EXPRESSION SUBPARTITION_EXPRESSION PARTITION_DESCRIPTION TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE CREATE_TIME UPDATE_TIME CHECK_TIME CHECKSUM PARTITION_COMMENT NODEGROUP TABLESPACE_NAME
-NULL test t1 p0 NULL 1 NULL KEY NULL NULL NULL 0 0 0 NULL 0 0 NULL NULL NULL NULL default ts
+def test t1 p0 NULL 1 NULL KEY NULL NULL NULL 0 0 0 NULL 0 0 NULL NULL NULL NULL default ts
SELECT * FROM test.t1 ORDER BY a1;
a1 a2 a3
1 2.2345 20000001
=== modified file 'mysql-test/suite/ndb/r/ndb_dd_disk2memory.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_disk2memory.result 2008-12-22 11:10:00 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_disk2memory.result 2011-06-08 12:00:29 +0000
@@ -245,7 +245,7 @@ t1 CREATE TABLE `t1` (
`b` int(11) NOT NULL,
`c` int(11) NOT NULL,
PRIMARY KEY (`pk1`)
-) /*!50100 STORAGE MEMORY */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+) /*!50100 TABLESPACE table_space1 STORAGE MEMORY */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
DROP TABLE test.t1;
DROP TABLE test.t2;
=== modified file 'mysql-test/suite/ndb/r/ndb_index_unique.result'
--- a/mysql-test/suite/ndb/r/ndb_index_unique.result 2011-03-15 14:55:57 +0000
+++ b/mysql-test/suite/ndb/r/ndb_index_unique.result 2011-06-08 12:00:29 +0000
@@ -181,8 +181,8 @@ a b c
5 5 NULL
8 3 NULL
9 3 NULL
-set @old_ecpd = @@session.engine_condition_pushdown;
-set engine_condition_pushdown = true;
+set @old_os = @@session.optimizer_switch;
+set optimizer_switch = 'engine_condition_pushdown=on';
explain select * from t2 where (b = 3 OR b = 5) AND c IS NULL AND a < 9 order by a;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 range PRIMARY,b PRIMARY 4 NULL 2 Using where with pushed condition
@@ -191,7 +191,7 @@ a b c
3 3 NULL
5 5 NULL
8 3 NULL
-set engine_condition_pushdown = @old_ecpd;
+set optimizer_switch = @old_os;
drop table t2;
CREATE TABLE t3 (
a int unsigned NOT NULL,
@@ -682,7 +682,7 @@ create table t1 (a int primary key, b va
engine=ndb charset=utf8;
insert into t1 values (1, repeat(_utf8 0xe288ab6474, 200));
insert into t1 values (2, repeat(_utf8 0xe288ab6474, 200));
-ERROR 23000: Duplicate entry '∫dt∫dt key 'b'
+ERROR 23000: Duplicate entry '\222Bdt\222Bdt\222Bdt\222Bdt\222Bdt\222Bdt\222Bdt\222Bdt\222Bdt\222Bdt\222Bdt\222Bdt\222Bd' for key 'b'
select a, sha1(b) from t1;
a sha1(b)
1 08f5d02c8b8bc244f275bdfc22c42c5cab0d9d7d
@@ -750,8 +750,7 @@ Warning 1121 Ndb does not support unique
insert into t1 values
(0,0),(1,1),(2,2),(3,3),(4,4),
(5,null),(6,null),(7,null),(8,null),(9,null);
-set @old_ecpd = @@session.engine_condition_pushdown;
-set engine_condition_pushdown = 0;
+set optimizer_switch = 'engine_condition_pushdown=off';
select a from t1 where b is not null order by a;
a
0
@@ -766,7 +765,7 @@ a
7
8
9
-set engine_condition_pushdown = 1;
+set optimizer_switch = 'engine_condition_pushdown=on';
select a from t1 where b is not null order by a;
a
0
@@ -781,7 +780,7 @@ a
7
8
9
-set engine_condition_pushdown = @old_ecpd;
+set optimizer_switch = @old_os;
drop table t1;
create table t1 (
a int not null,
@@ -798,8 +797,7 @@ insert into t1 values
(5,null,0),(6,null,1),(7,null,1),(8,null,1),(9,null,2),
(10,0,null),(11,1,null),(12,1,null),(13,1,null),(14,2,null),
(15,null,null),(16,null,null),(17,null,null),(18,null,null),(19,null,null);
-set @old_ecpd = @@session.engine_condition_pushdown;
-set engine_condition_pushdown = 0;
+set optimizer_switch = 'engine_condition_pushdown=off';
select a from t1 where b is not null and c = 1 order by a;
a
1
@@ -843,7 +841,7 @@ a
2
3
4
-set engine_condition_pushdown = 1;
+set optimizer_switch = 'engine_condition_pushdown=on';
select a from t1 where b is not null and c = 1 order by a;
a
1
@@ -887,7 +885,7 @@ a
2
3
4
-set engine_condition_pushdown = @old_ecpd;
+set optimizer_switch = @old_os;
drop table t1;
create table t1 (pk int primary key, a int) engine=ndb;
create table t2 (pk int primary key, uq int, a int,
=== modified file 'mysql-test/suite/ndb/t/disabled.def'
--- a/mysql-test/suite/ndb/t/disabled.def 2011-05-30 21:13:02 +0000
+++ b/mysql-test/suite/ndb/t/disabled.def 2011-06-08 12:00:29 +0000
@@ -21,12 +21,8 @@ ndb_update_no_read : SEAGULL rbwr
ndb_condition_pushdown : SEAGULL
-ndb_dd_disk2memory : SEAGULL alter
-ndb_dd_alter : SEAGULL alter
-
ndb_index_ordered : SEAGULL alter in second connection deadlocks
-ndb_index_unique : SEAGULL different error with copying alter
ndb_read_multi_range : SEAGULL "total length of the partitioning fields is too large"
=== modified file 'mysql-test/suite/ndb/t/ndb_index_unique.test'
--- a/mysql-test/suite/ndb/t/ndb_index_unique.test 2011-01-21 12:43:19 +0000
+++ b/mysql-test/suite/ndb/t/ndb_index_unique.test 2011-06-08 12:00:29 +0000
@@ -111,11 +111,11 @@ insert t2 values(1,1,NULL),(2,2,2),(3,3,
select * from t2 where c IS NULL order by a;
select * from t2 where b = 3 AND c IS NULL order by a;
select * from t2 where (b = 3 OR b = 5) AND c IS NULL order by a;
-set @old_ecpd = @@session.engine_condition_pushdown;
-set engine_condition_pushdown = true;
+set @old_os = @@session.optimizer_switch;
+set optimizer_switch = 'engine_condition_pushdown=on';
explain select * from t2 where (b = 3 OR b = 5) AND c IS NULL AND a < 9 order by a;
select * from t2 where (b = 3 OR b = 5) AND c IS NULL AND a < 9 order by a;
-set engine_condition_pushdown = @old_ecpd;
+set optimizer_switch = @old_os;
drop table t2;
@@ -449,21 +449,20 @@ insert into t1 values
(0,0),(1,1),(2,2),(3,3),(4,4),
(5,null),(6,null),(7,null),(8,null),(9,null);
-set @old_ecpd = @@session.engine_condition_pushdown;
-set engine_condition_pushdown = 0;
+set optimizer_switch = 'engine_condition_pushdown=off';
# failed, empty result
select a from t1 where b is not null order by a;
# worked
select a from t1 where b is null order by a;
-set engine_condition_pushdown = 1;
+set optimizer_switch = 'engine_condition_pushdown=on';
# failed, empty result
select a from t1 where b is not null order by a;
# worked
select a from t1 where b is null order by a;
-set engine_condition_pushdown = @old_ecpd;
+set optimizer_switch = @old_os;
drop table t1;
@@ -482,9 +481,8 @@ insert into t1 values
(10,0,null),(11,1,null),(12,1,null),(13,1,null),(14,2,null),
(15,null,null),(16,null,null),(17,null,null),(18,null,null),(19,null,null);
-set @old_ecpd = @@session.engine_condition_pushdown;
-set engine_condition_pushdown = 0;
+set optimizer_switch = 'engine_condition_pushdown=off';
# worked
select a from t1 where b is not null and c = 1 order by a;
# failed, empty result
@@ -497,7 +495,7 @@ select a from t1 where b is not null and
select a from t1 where b is null and c is not null order by a;
select a from t1 where b is not null and c is not null order by a;
-set engine_condition_pushdown = 1;
+set optimizer_switch = 'engine_condition_pushdown=on';
# worked
select a from t1 where b is not null and c = 1 order by a;
# failed, empty result
@@ -510,7 +508,7 @@ select a from t1 where b is not null and
select a from t1 where b is null and c is not null order by a;
select a from t1 where b is not null and c is not null order by a;
-set engine_condition_pushdown = @old_ecpd;
+set optimizer_switch = @old_os;
drop table t1;
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc 2011-05-30 21:13:02 +0000
+++ b/sql/ha_ndbcluster.cc 2011-06-08 11:56:29 +0000
@@ -8367,19 +8367,6 @@ int ha_ndbcluster::create(const char *na
else
tab.setTablespaceName("DEFAULT-TS");
}
- else if (create_info->tablespace &&
- create_info->storage_media == HA_SM_MEMORY)
- {
- push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
- ER_ILLEGAL_HA_CREATE_OPTION,
- ER(ER_ILLEGAL_HA_CREATE_OPTION),
- ndbcluster_hton_name,
- "TABLESPACE currently only supported for "
- "STORAGE DISK");
- result= HA_ERR_UNSUPPORTED;
- goto abort_return;
- }
-
DBUG_PRINT("info", ("Table %s is %s stored with tablespace %s",
m_tabname,
(use_disk) ? "disk" : "memory",
No bundle (reason: useless for push emails).| Thread |
|---|
| • bzr push into mysql-5.5-cluster-alter branch (Martin.Skold:3351 to 3353) | Martin Skold | 8 Jun |
