Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
1.2234 06/07/06 20:04:48 tomas@stripped +5 -0
Bug #20820 auto inc table not handled correctly when restored from cluster backup
mysql-test/t/rpl_ndb_sync.test
1.9 06/07/06 20:04:35 tomas@stripped +2 -0
make sure only run in default cluster
mysql-test/t/rpl_ndb_dd_advance.test
1.6 06/07/06 20:04:35 tomas@stripped +2 -0
make sure only run in default cluster
mysql-test/t/ndb_restore.test
1.22 06/07/06 20:04:35 tomas@stripped +8 -3
Bug #20820 auto inc table not handled correctly when restored from cluster backup
mysql-test/t/ndb_dd_backuprestore.test
1.8 06/07/06 20:04:35 tomas@stripped +2 -0
make sure only run in default cluster
mysql-test/r/ndb_restore.result
1.18 06/07/06 20:04:35 tomas@stripped +14 -10
Bug #20820 auto inc table not handled correctly when restored from cluster backup
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: tomas
# Host: poseidon.ndb.mysql.com
# Root: /home/tomas/mysql-5.1-ndb
--- 1.7/mysql-test/t/ndb_dd_backuprestore.test 2006-07-05 01:50:06 +02:00
+++ 1.8/mysql-test/t/ndb_dd_backuprestore.test 2006-07-06 20:04:35 +02:00
@@ -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;
--- 1.5/mysql-test/t/rpl_ndb_dd_advance.test 2006-04-12 15:55:32 +02:00
+++ 1.6/mysql-test/t/rpl_ndb_dd_advance.test 2006-07-06 20:04:35 +02:00
@@ -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
--- 1.17/mysql-test/r/ndb_restore.result 2006-07-06 19:02:33 +02:00
+++ 1.18/mysql-test/r/ndb_restore.result 2006-07-06 20:04:35 +02:00
@@ -116,7 +116,7 @@
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 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 @@
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 @@
@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 @@
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 @@
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 @@
@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>
--- 1.21/mysql-test/t/ndb_restore.test 2006-07-06 19:02:33 +02:00
+++ 1.22/mysql-test/t/ndb_restore.test 2006-07-06 20:04:35 +02:00
@@ -152,7 +152,7 @@
--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 @@
#
# 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 @@
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 @@
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
--- 1.8/mysql-test/t/rpl_ndb_sync.test 2006-04-12 15:55:32 +02:00
+++ 1.9/mysql-test/t/rpl_ndb_sync.test 2006-07-06 20:04:35 +02:00
@@ -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
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2234) BUG#20820 | tomas | 6 Jul |
