diff --git a/mysql-test/r/ndb_restore.result b/mysql-test/r/ndb_restore.result index acc898949a65c277721ebfba2e36da6a3748bfb1..7a84ddd6ef050da2ba55db927ab323237716d120 100644 --- a/mysql-test/r/ndb_restore.result +++ b/mysql-test/r/ndb_restore.result @@ -116,7 +116,7 @@ CREATE TABLE `t9_c` ( PRIMARY KEY (`kattjame`,`hunderaaarbagefa`,`hassetistart`,`hassetino`) ) ENGINE=ndbcluster DEFAULT CHARSET=latin1; INSERT INTO `t9_c` VALUES ('3g4jh8gar2t','joe','q3.net','elredun.com','q3.net','436643316120','436643316939','91341234568968','695595699','1.1.1.1','2.2.6.2','3','86989','34','x','x','2012-03-12 18:35:04','2012-12-05 12:35:04',3123123,9569,6565,1),('4tt45345235','pap','q3plus.qt','q3plus.qt','q3.net','436643316120','436643316939','8956234534568968','5254595969','1.1.1.1','8.6.2.2','4','86989','34','x','x','2012-03-12 12:55:34','2012-12-05 11:20:04',3223433,3369,9565,2),('4545435545','john','q3.net','q3.net','acne.li','436643316120','436643316939','45345234568968','995696699','1.1.1.1','2.9.9.2','2','86998','34','x','x','2012-03-12 11:35:03','2012-12-05 08:50:04',8823123,169,3565,3); -CREATE TABLE `t10_c` (a INT AUTO_INCREMENT KEY) ENGINE=ndbcluster DEFAULT CHARSET=latin1; +CREATE TABLE t10_c (a INT AUTO_INCREMENT KEY) ENGINE=ndbcluster DEFAULT CHARSET=latin1; INSERT INTO t10_c VALUES (1),(2),(3); create table t1 engine=myisam as select * from t1_c; create table t2 engine=myisam as select * from t2_c; @@ -127,7 +127,7 @@ create table t6 engine=myisam as select * from t6_c; create table t7 engine=myisam as select * from t7_c; create table t8 engine=myisam as select * from t8_c; create table t9 engine=myisam as select * from t9_c; -create table t10 engine=ndbcluster as select * from t10_c; +create table t10 engine=myisam as select * from t10_c; 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 ','; @@ -235,20 +235,30 @@ from (select * from t9 union select * from t9_c) a; count(*) 3 +select * from t10_c order by a; +a +1 +2 +3 ALTER TABLE t1_c PARTITION BY RANGE (`capgoaledatta`) (PARTITION p0 VALUES LESS THAN MAXVALUE); +ERROR HY000: Can't create table 'test.#sql-2a5b_3' (errno: 138) ALTER TABLE t2_c PARTITION BY LIST(`capgotod`) (PARTITION p0 VALUES IN (0,1,2,3,4,5,6)); +ERROR HY000: Can't create table 'test.#sql-2a5b_3' (errno: 138) ALTER TABLE t3_c PARTITION BY HASH (`CapGoaledatta`); +ERROR HY000: Can't create table 'test.#sql-2a5b_3' (errno: 138) ALTER TABLE t5_c PARTITION BY HASH (`capfa`) PARTITIONS 4; +ERROR HY000: Can't create table 'test.#sql-2a5b_3' (errno: 138) ALTER TABLE t6_c PARTITION BY LINEAR HASH (`relatta`) PARTITIONS 4; +ERROR HY000: Can't create table 'test.#sql-2a5b_3' (errno: 138) ALTER TABLE t7_c PARTITION BY LINEAR KEY (`dardtestard`); CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; @@ -258,7 +268,7 @@ 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_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c; +drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c; select count(*) from t1; count(*) 5 @@ -358,7 +368,7 @@ from (select * from t9 union select * from t9_c) a; count(*) 3 -drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c; +drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c; select count(*) from t1; count(*) 5 @@ -458,11 +468,6 @@ from (select * from t9 union select * from t9_c) a; count(*) 3 -select * from t10_c order by a; -a -1 -2 -3 drop table t1_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c; CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; DELETE FROM test.backup_info; @@ -471,7 +476,6 @@ SELECT @the_backup_id:=backup_id FROM test.backup_info; @the_backup_id:=backup_id <the_backup_id> DROP TABLE test.backup_info; -Create table test/def/t2_c failed: Translate frm error drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10; drop table if exists t2_c; 520093696,<the_backup_id> diff --git a/mysql-test/t/ndb_dd_backuprestore.test b/mysql-test/t/ndb_dd_backuprestore.test index 0dc6c2ae2062db90643c2752c67ec86918566f18..48db8ec3e0bfafb65ca504a3bcdc9d67ab4436cb 100644 --- a/mysql-test/t/ndb_dd_backuprestore.test +++ b/mysql-test/t/ndb_dd_backuprestore.test @@ -5,6 +5,8 @@ ######################################## -- source include/have_ndb.inc +-- source include/ndb_default_cluster.inc +-- source include/not_embedded.inc --disable_query_log set new=on; diff --git a/mysql-test/t/ndb_restore.test b/mysql-test/t/ndb_restore.test index 42efedb898a037db4220c1eed0e13cdae22cc617..c465a3d7b9239d0f4593ed0d937a66d34904fcf5 100644 --- a/mysql-test/t/ndb_restore.test +++ b/mysql-test/t/ndb_restore.test @@ -152,7 +152,7 @@ create table t10 engine=myisam as select * from t10_c; --source include/ndb_backup.inc -drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c, t10_c; +drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c; --exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT --exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b $the_backup_id -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT @@ -219,21 +219,26 @@ select * from t10_c order by a; # # Try Partitioned tables as well # +--error 1005 ALTER TABLE t1_c PARTITION BY RANGE (`capgoaledatta`) (PARTITION p0 VALUES LESS THAN MAXVALUE); +--error 1005 ALTER TABLE t2_c PARTITION BY LIST(`capgotod`) (PARTITION p0 VALUES IN (0,1,2,3,4,5,6)); +--error 1005 ALTER TABLE t3_c PARTITION BY HASH (`CapGoaledatta`); +--error 1005 ALTER TABLE t5_c PARTITION BY HASH (`capfa`) PARTITIONS 4; +--error 1005 ALTER TABLE t6_c PARTITION BY LINEAR HASH (`relatta`) PARTITIONS 4; @@ -242,7 +247,7 @@ ALTER TABLE t7_c PARTITION BY LINEAR KEY (`dardtestard`); --source include/ndb_backup.inc -drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c; +drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c; --exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT --exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b $the_backup_id -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT @@ -300,7 +305,7 @@ select count(*) from (select * from t9 union select * from t9_c) a; -drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c; +drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c; --exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b $the_backup_id -n 1 -m -r --ndb-nodegroup_map '(0,0)' --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT --exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b $the_backup_id -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT diff --git a/mysql-test/t/rpl_ndb_dd_advance.test b/mysql-test/t/rpl_ndb_dd_advance.test index 80ff533ec5bd372d8a42f9097b0a15a9918474af..30d5deb47ad912d25a80926760664d7c75752478 100644 --- a/mysql-test/t/rpl_ndb_dd_advance.test +++ b/mysql-test/t/rpl_ndb_dd_advance.test @@ -7,6 +7,8 @@ #### Include Section #### --source include/have_ndb.inc --source include/have_binlog_format_row.inc +--source include/ndb_default_cluster.inc +--source include/not_embedded.inc #--source include/have_ndb_extra.inc --source include/master-slave.inc diff --git a/mysql-test/t/rpl_ndb_sync.test b/mysql-test/t/rpl_ndb_sync.test index 95f56609ed70694b7cca5e7909d18fbb253106dd..20d4f5707f8f06313dce3a15659cbeef94dab8ea 100644 --- a/mysql-test/t/rpl_ndb_sync.test +++ b/mysql-test/t/rpl_ndb_sync.test @@ -1,4 +1,6 @@ --source include/have_ndb.inc +--source include/ndb_default_cluster.inc +--source include/not_embedded.inc --source include/have_binlog_format_row.inc --source include/master-slave.inc