Commit 89e2fba4 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 

into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
parents 57a20557 16c54768

mysql-test/include/ndb_default_cluster.inc

+1 −1
Original line number Diff line number Diff line 
-- require r/ndb_default_cluster.require

disable_query_log;

show status like "Ndb_connected_host";

show status like "Ndb_config_from_host";

enable_query_log;

mysql-test/r/ndb_default_cluster.require

+1 −1
Original line number Diff line number Diff line 
Variable_name	Value

Ndb_connected_host	localhost
 
Ndb_config_from_host	localhost

mysql-test/r/ndb_restore.result

+15 −22
Original line number Diff line number Diff line 
use test;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;

drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c;

CREATE TABLE `t1_c` (

`capgoaledatta` smallint(5) unsigned NOT NULL auto_increment,

`goaledatta` char(2) NOT NULL default '',
@@ -116,6 +116,8 @@ 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;

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;

create table t3 engine=myisam as select * from t3_c;
@@ -125,6 +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=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 ',';
@@ -132,7 +135,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
@@ -232,20 +235,11 @@ from (select * from t9 union 
select * from t9_c) a;

count(*)

3

ALTER TABLE t1_c

PARTITION BY RANGE (`capgoaledatta`)

(PARTITION p0 VALUES LESS THAN MAXVALUE);

ALTER TABLE t2_c

PARTITION BY LIST(`capgotod`)

(PARTITION p0 VALUES IN (0,1,2,3,4,5,6));

ALTER TABLE t3_c

PARTITION BY HASH (`CapGoaledatta`);

ALTER TABLE t5_c

PARTITION BY HASH (`capfa`)

PARTITIONS 4;

ALTER TABLE t6_c

PARTITION BY LINEAR HASH (`relatta`)

PARTITIONS 4;

select * from t10_c order by a;

a

1

2

3

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;
@@ -255,7 +249,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
@@ -355,7 +349,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
@@ -455,7 +449,7 @@ from (select * from t9 union 
select * from t9_c) a;

count(*)

3

drop table t1_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;

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;

LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
@@ -463,7 +457,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;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;

drop table if exists t2_c;

520093696,<the_backup_id>

mysql-test/t/ndb_dd_backuprestore.test

+2 −0
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/ndb_restore.test

+19 −27
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 


--disable_warnings

use test;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;

drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c;

--enable_warnings



CREATE TABLE `t1_c` (
@@ -132,6 +132,13 @@ CREATE TABLE `t9_c` ( 
) 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);



# Bug #20820

# auto inc table not handled correctly when restored from cluster backup

# - before fix ndb_restore would not set auto inc value correct,

#   seen by select below

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;

create table t3 engine=myisam as select * from t3_c;
@@ -141,10 +148,11 @@ 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=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;

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
@@ -205,33 +213,17 @@ select count(*) 
  from (select * from t9 union 

        select * from t9_c) a;



# Bug #20820 cont'd

select * from t10_c order by a;



#

# Try Partitioned tables as well

#

ALTER TABLE t1_c

PARTITION BY RANGE (`capgoaledatta`)

(PARTITION p0 VALUES LESS THAN MAXVALUE);



ALTER TABLE t2_c

PARTITION BY LIST(`capgotod`)

(PARTITION p0 VALUES IN (0,1,2,3,4,5,6));



ALTER TABLE t3_c

PARTITION BY HASH (`CapGoaledatta`);



ALTER TABLE t5_c

PARTITION BY HASH (`capfa`)

PARTITIONS 4;



ALTER TABLE t6_c

PARTITION BY LINEAR HASH (`relatta`)

PARTITIONS 4;



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
@@ -289,7 +281,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
@@ -353,7 +345,7 @@ select count(*) 
#     guaranteed to be from t2_c, this since order of tables in backup

#     is none deterministic

# 

drop table t1_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;

drop table t1_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c;

--source include/ndb_backup.inc

--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --core=0 -b $the_backup_id -n 1 -m -r --ndb-nodegroup_map '(0,1)' $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id 2>&1 | grep Translate || true
@@ -362,7 +354,7 @@ drop table t1_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c; 
#



--disable_warnings

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;

drop table if exists t2_c;

--enable_warnings
@@ -372,4 +364,4 @@ drop table if exists t2_c; 


--exec $NDB_TOOLS_DIR/ndb_select_all --no-defaults -d sys -D , SYSTAB_0 | grep 520093696, | sed "s/,$the_backup_id/,<the_backup_id>/"



# End of 4.1 tests
 
# End of 5.0 tests (4.1 test intermixed to save test time)