From: Martin Zaun Date: February 22 2011 10:33pm Subject: bzr push into mysql-5.1-telco-7.0 branch (martin.zaun:4219 to 4221) List-Archive: http://lists.mysql.com/commits/131903 Message-Id: <201102222233.p1MMXXCF013409@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1364137427832553460==" --===============1364137427832553460== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 4221 Martin Zaun 2011-02-22 [merge] merge 4220 Martin Zaun 2011-02-22 [merge] merge from ndb-7.0-ndb_restore-test-cleanup to ndb-7.0 added: mysql-test/suite/ndb/r/ndb_restore_schema_tolerance.result mysql-test/suite/ndb/t/ndb_restore_schema_tolerance.test renamed: mysql-test/suite/ndb/r/ndb_blob_restore.result => mysql-test/suite/ndb/r/ndb_restore_schema_blobs.result mysql-test/suite/ndb/r/ndb_restore.result => mysql-test/suite/ndb/r/ndb_restore_misc.result mysql-test/suite/ndb/r/ndb_restore_compat.result => mysql-test/suite/ndb/r/ndb_restore_compat_downward.result mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result => mysql-test/suite/ndb/r/ndb_restore_compat_endianness.result mysql-test/suite/ndb/r/ndb_restore_lossy_charbinary_conv.result => mysql-test/suite/ndb/r/ndb_restore_conv_lossy_charbinary.result mysql-test/suite/ndb/r/ndb_restore_lossy_integral_conv.result => mysql-test/suite/ndb/r/ndb_restore_conv_lossy_integral.result mysql-test/suite/ndb/r/ndb_restore_options.result => mysql-test/suite/ndb/r/ndb_restore_schema_subsets.result mysql-test/suite/ndb/r/ndb_restore_padding_preservation.result => mysql-test/suite/ndb/r/ndb_restore_conv_padding.result mysql-test/suite/ndb/r/ndb_restore_partition.result => mysql-test/suite/ndb/r/ndb_restore_schema_partitions.result mysql-test/suite/ndb/r/ndb_restore_promotion.result => mysql-test/suite/ndb/r/ndb_restore_conv_promotion.result mysql-test/suite/ndb/r/ndb_restore_rewrite_db.result => mysql-test/suite/ndb/r/ndb_restore_schema_rewrites.result mysql-test/suite/ndb/t/ndb_blob_restore.test => mysql-test/suite/ndb/t/ndb_restore_schema_blobs.test mysql-test/suite/ndb/t/ndb_restore.test => mysql-test/suite/ndb/t/ndb_restore_misc.test mysql-test/suite/ndb/t/ndb_restore_compat.test => mysql-test/suite/ndb/t/ndb_restore_compat_downward.test mysql-test/suite/ndb/t/ndb_restore_compressed-master.opt => mysql-test/suite/ndb/t/ndb_restore_compat_compression-master.opt mysql-test/suite/ndb/t/ndb_restore_compressed.test => mysql-test/suite/ndb/t/ndb_restore_compat_compression.test mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test => mysql-test/suite/ndb/t/ndb_restore_compat_endianness.test mysql-test/suite/ndb/t/ndb_restore_lossy_charbinary_conv.test => mysql-test/suite/ndb/t/ndb_restore_conv_lossy_charbinary.test mysql-test/suite/ndb/t/ndb_restore_lossy_integral_conv.test => mysql-test/suite/ndb/t/ndb_restore_conv_lossy_integral.test mysql-test/suite/ndb/t/ndb_restore_options.test => mysql-test/suite/ndb/t/ndb_restore_schema_subsets.test mysql-test/suite/ndb/t/ndb_restore_padding_preservation.test => mysql-test/suite/ndb/t/ndb_restore_conv_padding.test mysql-test/suite/ndb/t/ndb_restore_partition.test => mysql-test/suite/ndb/t/ndb_restore_schema_partitions.test mysql-test/suite/ndb/t/ndb_restore_promotion.test => mysql-test/suite/ndb/t/ndb_restore_conv_promotion.test mysql-test/suite/ndb/t/ndb_restore_rewrite_db.test => mysql-test/suite/ndb/t/ndb_restore_schema_rewrites.test modified: mysql-test/suite/ndb/t/ndb_restore_print.test mysql-test/suite/ndb/r/ndb_restore_schema_subsets.result mysql-test/suite/ndb/t/ndb_restore_schema_blobs.test mysql-test/suite/ndb/t/ndb_restore_misc.test mysql-test/suite/ndb/t/ndb_restore_compat_downward.test mysql-test/suite/ndb/t/ndb_restore_compat_compression-master.opt mysql-test/suite/ndb/t/ndb_restore_compat_compression.test mysql-test/suite/ndb/t/ndb_restore_compat_endianness.test mysql-test/suite/ndb/t/ndb_restore_conv_lossy_charbinary.test mysql-test/suite/ndb/t/ndb_restore_conv_lossy_integral.test mysql-test/suite/ndb/t/ndb_restore_schema_subsets.test mysql-test/suite/ndb/t/ndb_restore_conv_padding.test mysql-test/suite/ndb/t/ndb_restore_schema_partitions.test mysql-test/suite/ndb/t/ndb_restore_conv_promotion.test mysql-test/suite/ndb/t/ndb_restore_schema_rewrites.test 4219 Ole John Aske 2011-02-22 Updated MTR result file after last commit which changed some tests from using lower- to uppercase. modified: mysql-test/r/greedy_optimizer.result === renamed file 'mysql-test/suite/ndb/r/ndb_restore_compat.result' => 'mysql-test/suite/ndb/r/ndb_restore_compat_downward.result' === renamed file 'mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result' => 'mysql-test/suite/ndb/r/ndb_restore_compat_endianness.result' === renamed file 'mysql-test/suite/ndb/r/ndb_restore_lossy_charbinary_conv.result' => 'mysql-test/suite/ndb/r/ndb_restore_conv_lossy_charbinary.result' === renamed file 'mysql-test/suite/ndb/r/ndb_restore_lossy_integral_conv.result' => 'mysql-test/suite/ndb/r/ndb_restore_conv_lossy_integral.result' === renamed file 'mysql-test/suite/ndb/r/ndb_restore_padding_preservation.result' => 'mysql-test/suite/ndb/r/ndb_restore_conv_padding.result' === renamed file 'mysql-test/suite/ndb/r/ndb_restore_promotion.result' => 'mysql-test/suite/ndb/r/ndb_restore_conv_promotion.result' === renamed file 'mysql-test/suite/ndb/r/ndb_restore.result' => 'mysql-test/suite/ndb/r/ndb_restore_misc.result' === renamed file 'mysql-test/suite/ndb/r/ndb_blob_restore.result' => 'mysql-test/suite/ndb/r/ndb_restore_schema_blobs.result' === renamed file 'mysql-test/suite/ndb/r/ndb_restore_partition.result' => 'mysql-test/suite/ndb/r/ndb_restore_schema_partitions.result' === renamed file 'mysql-test/suite/ndb/r/ndb_restore_rewrite_db.result' => 'mysql-test/suite/ndb/r/ndb_restore_schema_rewrites.result' === renamed file 'mysql-test/suite/ndb/r/ndb_restore_options.result' => 'mysql-test/suite/ndb/r/ndb_restore_schema_subsets.result' --- a/mysql-test/suite/ndb/r/ndb_restore_options.result 2010-06-11 20:30:56 +0000 +++ b/mysql-test/suite/ndb/r/ndb_restore_schema_subsets.result 2011-02-22 03:29:24 +0000 @@ -510,181 +510,3 @@ tab2 drop table db2.tab1, db2.tab2; drop database db1; drop database db2; -Test ndb_restore ability to ignore some schema differences -use test; -create table t1 ( -a int, -b int, -c int, -d int, -e varchar(200), -f int, -g char(20), -h text, -i int, -primary key(a,b)) TABLESPACE ts1 engine = ndb; -insert into t1 values -(1, 1, 1, 1, '1', 1, 'Rankin', 'Rebus', 1), -(2, 2, 2, 2, '2', 2, 'Doyle', 'Holmes', 2), -(3, 3, 3, 3, '3', 3, 'Burns', 'Mouse', 3), -(4, 4, 4, 4, '4', 4, 'Gibbon', 'Chris', 4), -(5, 5, 5, 5, '5', 5, 'Gray', 'Lanark', 5); -select * from t1 order by a; -a b c d e f g h i -1 1 1 1 1 1 Rankin Rebus 1 -2 2 2 2 2 2 Doyle Holmes 2 -3 3 3 3 3 3 Burns Mouse 3 -4 4 4 4 4 4 Gibbon Chris 4 -5 5 5 5 5 5 Gray Lanark 5 -Backing up data -drop table t1; -Normal restore -show create table t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL DEFAULT '0', - `b` int(11) NOT NULL DEFAULT '0', - `c` int(11) DEFAULT NULL, - `d` int(11) DEFAULT NULL, - `e` varchar(200) DEFAULT NULL, - `f` int(11) DEFAULT NULL, - `g` char(20) DEFAULT NULL, - `h` text, - `i` int(11) DEFAULT NULL, - PRIMARY KEY (`a`,`b`) -) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1 -select * from t1 order by a; -a b c d e f g h i -1 1 1 1 1 1 Rankin Rebus 1 -2 2 2 2 2 2 Doyle Holmes 2 -3 3 3 3 3 3 Burns Mouse 3 -4 4 4 4 4 4 Gibbon Chris 4 -5 5 5 5 5 5 Gray Lanark 5 -truncate t1; -Column name change, should fail without --exclude-missing-columns -alter table t1 change c cc int; -Retry with --exclude-missing-columns -select * from t1 order by a; -a b cc d e f g h i -1 1 NULL 1 1 1 Rankin Rebus 1 -2 2 NULL 2 2 2 Doyle Holmes 2 -3 3 NULL 3 3 3 Burns Mouse 3 -4 4 NULL 4 4 4 Gibbon Chris 4 -5 5 NULL 5 5 5 Gray Lanark 5 -truncate t1; -Column type change, should fail -alter table t1 change cc c bigint; -show create table t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL DEFAULT '0', - `b` int(11) NOT NULL DEFAULT '0', - `c` bigint(20) DEFAULT NULL, - `d` int(11) DEFAULT NULL, - `e` varchar(200) DEFAULT NULL, - `f` int(11) DEFAULT NULL, - `g` char(20) DEFAULT NULL, - `h` text, - `i` int(11) DEFAULT NULL, - PRIMARY KEY (`a`,`b`) -) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1 -Retry with --promote-attribute -select * from t1 order by a; -a b c d e f g h i -1 1 1 1 1 1 Rankin Rebus 1 -2 2 2 2 2 2 Doyle Holmes 2 -3 3 3 3 3 3 Burns Mouse 3 -4 4 4 4 4 4 Gibbon Chris 4 -5 5 5 5 5 5 Gray Lanark 5 -truncate t1; -Column nullability change, should fail -alter table t1 change c c int not null; -alter table t1 change c c int; -Column length change, should fail -alter table t1 change g g char(22); -Character set difference, should fail -alter table t1 change g g char(20) character set binary; -alter table t1 change g g char(20); -AutoIncrement difference, should fail -alter table t1 change b b int auto_increment; -Default difference, should pass -alter table t1 change b b int default 22; -select * from t1 order by a; -a b c d e f g h i -1 1 1 1 1 1 Rankin Rebus 1 -2 2 2 2 2 2 Doyle Holmes 2 -3 3 3 3 3 3 Burns Mouse 3 -4 4 4 4 4 4 Gibbon Chris 4 -5 5 5 5 5 5 Gray Lanark 5 -truncate t1; -alter table t1 change b b int; -ArrayType difference, should fail -alter table t1 change e e varchar(300); -alter table t1 change e e varchar(200); -StorageType difference, should pass -CREATE LOGFILE GROUP lg1 -ADD UNDOFILE 'undofile.dat' -INITIAL_SIZE 16M -UNDO_BUFFER_SIZE = 1M -ENGINE=NDB; -CREATE TABLESPACE ts1 -ADD DATAFILE 'datafile.dat' -USE LOGFILE GROUP lg1 -INITIAL_SIZE 12M -ENGINE NDB; -alter table t1 change i i int storage disk; -select * from t1 order by a; -a b c d e f g h i -1 1 1 1 1 1 Rankin Rebus 1 -2 2 2 2 2 2 Doyle Holmes 2 -3 3 3 3 3 3 Burns Mouse 3 -4 4 4 4 4 4 Gibbon Chris 4 -5 5 5 5 5 5 Gray Lanark 5 -alter table t1 change i i int storage memory; -truncate t1; -Dynamic property difference, should pass -alter table t1 change c c int column_format dynamic; -select * from t1 order by a; -a b c d e f g h i -1 1 1 1 1 1 Rankin Rebus 1 -2 2 2 2 2 2 Doyle Holmes 2 -3 3 3 3 3 3 Burns Mouse 3 -4 4 4 4 4 4 Gibbon Chris 4 -5 5 5 5 5 5 Gray Lanark 5 -drop table t1; -alter tablespace ts1 drop datafile 'datafile.dat' engine=ndb; -drop tablespace ts1 engine=ndb; -drop logfile group lg1 engine=ndb; -Different PK columns, should fail -create table t1 ( -a int, -b int, -c int, -d int, -e varchar(200), -f int, -g char(20), -h text, -i int, -primary key (a)) TABLESPACE ts1 engine = ndb; -drop table t1; -Different distribution keys, should pass -create table t1 ( -a int, -b int, -c int, -d int, -e varchar(200), -f int, -g char(20), -h text, -i int, -primary key(a,b)) TABLESPACE ts1 engine = ndb partition by key(a); -select * from t1 order by a; -a b c d e f g h i -1 1 1 1 1 1 Rankin Rebus 1 -2 2 2 2 2 2 Doyle Holmes 2 -3 3 3 3 3 3 Burns Mouse 3 -4 4 4 4 4 4 Gibbon Chris 4 -5 5 5 5 5 5 Gray Lanark 5 -drop table t1; === added file 'mysql-test/suite/ndb/r/ndb_restore_schema_tolerance.result' --- a/mysql-test/suite/ndb/r/ndb_restore_schema_tolerance.result 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/ndb/r/ndb_restore_schema_tolerance.result 2011-02-22 03:29:24 +0000 @@ -0,0 +1,178 @@ +Test ndb_restore ability to ignore some schema differences +use test; +create table t1 ( +a int, +b int, +c int, +d int, +e varchar(200), +f int, +g char(20), +h text, +i int, +primary key(a,b)) TABLESPACE ts1 engine = ndb; +insert into t1 values +(1, 1, 1, 1, '1', 1, 'Rankin', 'Rebus', 1), +(2, 2, 2, 2, '2', 2, 'Doyle', 'Holmes', 2), +(3, 3, 3, 3, '3', 3, 'Burns', 'Mouse', 3), +(4, 4, 4, 4, '4', 4, 'Gibbon', 'Chris', 4), +(5, 5, 5, 5, '5', 5, 'Gray', 'Lanark', 5); +select * from t1 order by a; +a b c d e f g h i +1 1 1 1 1 1 Rankin Rebus 1 +2 2 2 2 2 2 Doyle Holmes 2 +3 3 3 3 3 3 Burns Mouse 3 +4 4 4 4 4 4 Gibbon Chris 4 +5 5 5 5 5 5 Gray Lanark 5 +Backing up data +drop table t1; +Normal restore +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) NOT NULL DEFAULT '0', + `b` int(11) NOT NULL DEFAULT '0', + `c` int(11) DEFAULT NULL, + `d` int(11) DEFAULT NULL, + `e` varchar(200) DEFAULT NULL, + `f` int(11) DEFAULT NULL, + `g` char(20) DEFAULT NULL, + `h` text, + `i` int(11) DEFAULT NULL, + PRIMARY KEY (`a`,`b`) +) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1 +select * from t1 order by a; +a b c d e f g h i +1 1 1 1 1 1 Rankin Rebus 1 +2 2 2 2 2 2 Doyle Holmes 2 +3 3 3 3 3 3 Burns Mouse 3 +4 4 4 4 4 4 Gibbon Chris 4 +5 5 5 5 5 5 Gray Lanark 5 +truncate t1; +Column name change, should fail without --exclude-missing-columns +alter table t1 change c cc int; +Retry with --exclude-missing-columns +select * from t1 order by a; +a b cc d e f g h i +1 1 NULL 1 1 1 Rankin Rebus 1 +2 2 NULL 2 2 2 Doyle Holmes 2 +3 3 NULL 3 3 3 Burns Mouse 3 +4 4 NULL 4 4 4 Gibbon Chris 4 +5 5 NULL 5 5 5 Gray Lanark 5 +truncate t1; +Column type change, should fail +alter table t1 change cc c bigint; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) NOT NULL DEFAULT '0', + `b` int(11) NOT NULL DEFAULT '0', + `c` bigint(20) DEFAULT NULL, + `d` int(11) DEFAULT NULL, + `e` varchar(200) DEFAULT NULL, + `f` int(11) DEFAULT NULL, + `g` char(20) DEFAULT NULL, + `h` text, + `i` int(11) DEFAULT NULL, + PRIMARY KEY (`a`,`b`) +) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1 +Retry with --promote-attribute +select * from t1 order by a; +a b c d e f g h i +1 1 1 1 1 1 Rankin Rebus 1 +2 2 2 2 2 2 Doyle Holmes 2 +3 3 3 3 3 3 Burns Mouse 3 +4 4 4 4 4 4 Gibbon Chris 4 +5 5 5 5 5 5 Gray Lanark 5 +truncate t1; +Column nullability change, should fail +alter table t1 change c c int not null; +alter table t1 change c c int; +Column length change, should fail +alter table t1 change g g char(22); +Character set difference, should fail +alter table t1 change g g char(20) character set binary; +alter table t1 change g g char(20); +AutoIncrement difference, should fail +alter table t1 change b b int auto_increment; +Default difference, should pass +alter table t1 change b b int default 22; +select * from t1 order by a; +a b c d e f g h i +1 1 1 1 1 1 Rankin Rebus 1 +2 2 2 2 2 2 Doyle Holmes 2 +3 3 3 3 3 3 Burns Mouse 3 +4 4 4 4 4 4 Gibbon Chris 4 +5 5 5 5 5 5 Gray Lanark 5 +truncate t1; +alter table t1 change b b int; +ArrayType difference, should fail +alter table t1 change e e varchar(300); +alter table t1 change e e varchar(200); +StorageType difference, should pass +CREATE LOGFILE GROUP lg1 +ADD UNDOFILE 'undofile.dat' +INITIAL_SIZE 16M +UNDO_BUFFER_SIZE = 1M +ENGINE=NDB; +CREATE TABLESPACE ts1 +ADD DATAFILE 'datafile.dat' +USE LOGFILE GROUP lg1 +INITIAL_SIZE 12M +ENGINE NDB; +alter table t1 change i i int storage disk; +select * from t1 order by a; +a b c d e f g h i +1 1 1 1 1 1 Rankin Rebus 1 +2 2 2 2 2 2 Doyle Holmes 2 +3 3 3 3 3 3 Burns Mouse 3 +4 4 4 4 4 4 Gibbon Chris 4 +5 5 5 5 5 5 Gray Lanark 5 +alter table t1 change i i int storage memory; +truncate t1; +Dynamic property difference, should pass +alter table t1 change c c int column_format dynamic; +select * from t1 order by a; +a b c d e f g h i +1 1 1 1 1 1 Rankin Rebus 1 +2 2 2 2 2 2 Doyle Holmes 2 +3 3 3 3 3 3 Burns Mouse 3 +4 4 4 4 4 4 Gibbon Chris 4 +5 5 5 5 5 5 Gray Lanark 5 +drop table t1; +alter tablespace ts1 drop datafile 'datafile.dat' engine=ndb; +drop tablespace ts1 engine=ndb; +drop logfile group lg1 engine=ndb; +Different PK columns, should fail +create table t1 ( +a int, +b int, +c int, +d int, +e varchar(200), +f int, +g char(20), +h text, +i int, +primary key (a)) TABLESPACE ts1 engine = ndb; +drop table t1; +Different distribution keys, should pass +create table t1 ( +a int, +b int, +c int, +d int, +e varchar(200), +f int, +g char(20), +h text, +i int, +primary key(a,b)) TABLESPACE ts1 engine = ndb partition by key(a); +select * from t1 order by a; +a b c d e f g h i +1 1 1 1 1 1 Rankin Rebus 1 +2 2 2 2 2 2 Doyle Holmes 2 +3 3 3 3 3 3 Burns Mouse 3 +4 4 4 4 4 4 Gibbon Chris 4 +5 5 5 5 5 5 Gray Lanark 5 +drop table t1; === renamed file 'mysql-test/suite/ndb/t/ndb_restore_compressed-master.opt' => 'mysql-test/suite/ndb/t/ndb_restore_compat_compression-master.opt' --- a/mysql-test/suite/ndb/t/ndb_restore_compressed-master.opt 2009-04-09 15:27:21 +0000 +++ b/mysql-test/suite/ndb/t/ndb_restore_compat_compression-master.opt 2011-02-22 01:15:42 +0000 @@ -1 +1 @@ ---result-file=../suite/ndb/r/ndb_restore +--result-file=../suite/ndb/r/ndb_restore_misc === renamed file 'mysql-test/suite/ndb/t/ndb_restore_compressed.test' => 'mysql-test/suite/ndb/t/ndb_restore_compat_compression.test' --- a/mysql-test/suite/ndb/t/ndb_restore_compressed.test 2009-10-06 12:03:16 +0000 +++ b/mysql-test/suite/ndb/t/ndb_restore_compat_compression.test 2011-02-22 03:29:24 +0000 @@ -1,8 +1,12 @@ -# Turn on compressed backup with magic DUMP command +###################################################################### +# Test restoring compressed backups +###################################################################### + +# turn on compressed backup with magic DUMP command --exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "all dump 13001 1" >> $NDB_TOOLS_OUTPUT -# Run the ndb_restore test, should produce exactly the same output -source ndb_restore.test; +# run the ndb_restore test, should produce exactly the same output +source ndb_restore_misc.test; -# Turn off compressed backups +# turn off compressed backups --exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "all dump 13001 0" >> $NDB_TOOLS_OUTPUT === renamed file 'mysql-test/suite/ndb/t/ndb_restore_compat.test' => 'mysql-test/suite/ndb/t/ndb_restore_compat_downward.test' --- a/mysql-test/suite/ndb/t/ndb_restore_compat.test 2010-12-03 09:36:45 +0000 +++ b/mysql-test/suite/ndb/t/ndb_restore_compat_downward.test 2011-02-22 03:29:24 +0000 @@ -1,3 +1,7 @@ +###################################################################### +# Test restoring backups of older/packed formats +###################################################################### + -- source include/have_ndb.inc -- source include/have_case_sensitive_file_system.inc === renamed file 'mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test' => 'mysql-test/suite/ndb/t/ndb_restore_compat_endianness.test' --- a/mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test 2010-10-25 09:15:03 +0000 +++ b/mysql-test/suite/ndb/t/ndb_restore_compat_endianness.test 2011-02-22 03:29:24 +0000 @@ -1,3 +1,7 @@ +###################################################################### +# Test restoring backups of different endianness +###################################################################### + -- source include/have_ndb.inc -- source include/ndb_default_cluster.inc === renamed file 'mysql-test/suite/ndb/t/ndb_restore_lossy_charbinary_conv.test' => 'mysql-test/suite/ndb/t/ndb_restore_conv_lossy_charbinary.test' --- a/mysql-test/suite/ndb/t/ndb_restore_lossy_charbinary_conv.test 2010-10-23 06:46:02 +0000 +++ b/mysql-test/suite/ndb/t/ndb_restore_conv_lossy_charbinary.test 2011-02-22 03:29:24 +0000 @@ -1,7 +1,5 @@ ###################################################################### -# Author: Martin Zaun -# Date: 2010-10 -# Purpose: Lossy conversion test for [var]char and [var]binary types +# Test restoring backups with lossy conversions on [var]char|binary types ###################################################################### -- source include/have_ndb.inc === renamed file 'mysql-test/suite/ndb/t/ndb_restore_lossy_integral_conv.test' => 'mysql-test/suite/ndb/t/ndb_restore_conv_lossy_integral.test' --- a/mysql-test/suite/ndb/t/ndb_restore_lossy_integral_conv.test 2010-10-23 06:46:02 +0000 +++ b/mysql-test/suite/ndb/t/ndb_restore_conv_lossy_integral.test 2011-02-22 03:29:24 +0000 @@ -1,7 +1,5 @@ ###################################################################### -# Author: Martin Zaun -# Date: 2010-10 -# Purpose: Lossy conversion test for integral types +# Test restoring backups with lossy conversions on integral types ###################################################################### -- source include/have_ndb.inc === renamed file 'mysql-test/suite/ndb/t/ndb_restore_padding_preservation.test' => 'mysql-test/suite/ndb/t/ndb_restore_conv_padding.test' --- a/mysql-test/suite/ndb/t/ndb_restore_padding_preservation.test 2010-10-23 06:46:02 +0000 +++ b/mysql-test/suite/ndb/t/ndb_restore_conv_padding.test 2011-02-22 03:29:24 +0000 @@ -1,7 +1,5 @@ ###################################################################### -# Author: Martin Zaun -# Date: 2010-10 -# Purpose: Right-padding preservation test for char and binary types +# Test restoring backups with preserving padding in char/bin conversions ###################################################################### -- source include/have_ndb.inc === renamed file 'mysql-test/suite/ndb/t/ndb_restore_promotion.test' => 'mysql-test/suite/ndb/t/ndb_restore_conv_promotion.test' --- a/mysql-test/suite/ndb/t/ndb_restore_promotion.test 2010-04-29 14:52:05 +0000 +++ b/mysql-test/suite/ndb/t/ndb_restore_conv_promotion.test 2011-02-22 03:29:24 +0000 @@ -1,8 +1,6 @@ -############################################################# -# Author: Guangbao -# Date: 2007-11 -# Purpose: Basic Integer,Char and Binary type promotion test -############################################################## +###################################################################### +# Test restoring backups with widening type conversions (promotion) +###################################################################### -- source include/have_ndb.inc -- source include/not_embedded.inc === renamed file 'mysql-test/suite/ndb/t/ndb_restore.test' => 'mysql-test/suite/ndb/t/ndb_restore_misc.test' --- a/mysql-test/suite/ndb/t/ndb_restore.test 2011-01-21 10:29:46 +0000 +++ b/mysql-test/suite/ndb/t/ndb_restore_misc.test 2011-02-22 03:29:24 +0000 @@ -1,3 +1,7 @@ +###################################################################### +# Test various issues ndb_restore had at some time +###################################################################### + -- source include/have_ndb.inc -- source include/ndb_default_cluster.inc === modified file 'mysql-test/suite/ndb/t/ndb_restore_print.test' --- a/mysql-test/suite/ndb/t/ndb_restore_print.test 2009-04-08 13:19:57 +0000 +++ b/mysql-test/suite/ndb/t/ndb_restore_print.test 2011-02-22 01:15:42 +0000 @@ -1,3 +1,7 @@ +###################################################################### +# Test ndb_restore's print_data feature +###################################################################### + -- source include/have_ndb.inc -- source include/ndb_default_cluster.inc === renamed file 'mysql-test/suite/ndb/t/ndb_blob_restore.test' => 'mysql-test/suite/ndb/t/ndb_restore_schema_blobs.test' --- a/mysql-test/suite/ndb/t/ndb_blob_restore.test 2008-12-22 11:10:00 +0000 +++ b/mysql-test/suite/ndb/t/ndb_restore_schema_blobs.test 2011-02-22 03:29:24 +0000 @@ -1,3 +1,7 @@ +###################################################################### +# Test restoring backups with blob columns +###################################################################### + -- source include/have_ndb.inc -- source include/ndb_default_cluster.inc === renamed file 'mysql-test/suite/ndb/t/ndb_restore_partition.test' => 'mysql-test/suite/ndb/t/ndb_restore_schema_partitions.test' --- a/mysql-test/suite/ndb/t/ndb_restore_partition.test 2009-10-09 15:08:04 +0000 +++ b/mysql-test/suite/ndb/t/ndb_restore_schema_partitions.test 2011-02-22 03:29:24 +0000 @@ -1,3 +1,7 @@ +###################################################################### +# Test restoring backups into partitioned tables +###################################################################### + -- source include/have_ndb.inc -- source include/ndb_default_cluster.inc === renamed file 'mysql-test/suite/ndb/t/ndb_restore_rewrite_db.test' => 'mysql-test/suite/ndb/t/ndb_restore_schema_rewrites.test' --- a/mysql-test/suite/ndb/t/ndb_restore_rewrite_db.test 2011-02-02 10:17:58 +0000 +++ b/mysql-test/suite/ndb/t/ndb_restore_schema_rewrites.test 2011-02-22 03:29:24 +0000 @@ -1,7 +1,5 @@ ###################################################################### -# Author: Martin Zaun -# Date: 2011-01 -# Purpose: test of rewrite-database feature +# Test restoring backups into renamed databases ###################################################################### -- source include/have_ndb.inc === renamed file 'mysql-test/suite/ndb/t/ndb_restore_options.test' => 'mysql-test/suite/ndb/t/ndb_restore_schema_subsets.test' --- a/mysql-test/suite/ndb/t/ndb_restore_options.test 2010-06-11 20:30:56 +0000 +++ b/mysql-test/suite/ndb/t/ndb_restore_schema_subsets.test 2011-02-22 03:29:24 +0000 @@ -1,8 +1,10 @@ +###################################################################### +# Test restoring backups with in- or excluding tables or databases +###################################################################### + -- source include/have_ndb.inc -- source include/ndb_default_cluster.inc -# Bug#40429 Ignore tables when restoring - --echo ************************************* --echo Creating various databases and tables --echo ************************************* @@ -346,206 +348,3 @@ drop table db2.tab1, db2.tab2; drop database db1; drop database db2; - -# End of bug 40429 - - ---echo Test ndb_restore ability to ignore some schema differences - -use test; -create table t1 ( - a int, - b int, - c int, - d int, - e varchar(200), - f int, - g char(20), - h text, - i int, - primary key(a,b)) TABLESPACE ts1 engine = ndb; - -insert into t1 values - (1, 1, 1, 1, '1', 1, 'Rankin', 'Rebus', 1), - (2, 2, 2, 2, '2', 2, 'Doyle', 'Holmes', 2), - (3, 3, 3, 3, '3', 3, 'Burns', 'Mouse', 3), - (4, 4, 4, 4, '4', 4, 'Gibbon', 'Chris', 4), - (5, 5, 5, 5, '5', 5, 'Gray', 'Lanark', 5); - -select * from t1 order by a; - ---echo Backing up data ---source include/ndb_backup.inc - -drop table t1; - ---echo Normal restore ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r -m $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 2 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - -show create table t1; - -select * from t1 order by a; - -truncate t1; - ---echo Column name change, should fail without --exclude-missing-columns - -alter table t1 change c cc int; - ---error 1 ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - ---echo Retry with --exclude-missing-columns - ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r --exclude-missing-columns $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 2 -r --exclude-missing-columns $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - -select * from t1 order by a; -truncate t1; - ---echo Column type change, should fail - -alter table t1 change cc c bigint; -show create table t1; #REMOVE! ---error 1 ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - ---echo Retry with --promote-attribute - ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r --promote-attribute $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 2 -r --promote-attribute $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - -select * from t1 order by a; -truncate t1; - ---echo Column nullability change, should fail - -alter table t1 change c c int not null; - ---error 1 ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - -alter table t1 change c c int; - -# Skip Precision and scale differences - should fail - ---echo Column length change, should fail - -alter table t1 change g g char(22); - ---error 1 ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - ---echo Character set difference, should fail - -alter table t1 change g g char(20) character set binary; - ---error 1 ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - -alter table t1 change g g char(20); - ---echo AutoIncrement difference, should fail - -alter table t1 change b b int auto_increment; - ---error 1 ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - ---echo Default difference, should pass -alter table t1 change b b int default 22; - ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 2 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - -select * from t1 order by a; -truncate t1; - -alter table t1 change b b int; - ---echo ArrayType difference, should fail -alter table t1 change e e varchar(300); - ---error 1 ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - -alter table t1 change e e varchar(200); - ---echo StorageType difference, should pass -CREATE LOGFILE GROUP lg1 -ADD UNDOFILE 'undofile.dat' -INITIAL_SIZE 16M -UNDO_BUFFER_SIZE = 1M -ENGINE=NDB; - -CREATE TABLESPACE ts1 -ADD DATAFILE 'datafile.dat' -USE LOGFILE GROUP lg1 -INITIAL_SIZE 12M -ENGINE NDB; - -alter table t1 change i i int storage disk; - ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 2 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - -select * from t1 order by a; - -alter table t1 change i i int storage memory; -truncate t1; - -# Skip BlobType difference (should fail) - ---echo Dynamic property difference, should pass - -alter table t1 change c c int column_format dynamic; - ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 2 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - -select * from t1 order by a; - -drop table t1; -alter tablespace ts1 drop datafile 'datafile.dat' engine=ndb; -drop tablespace ts1 engine=ndb; -drop logfile group lg1 engine=ndb; - ---echo Different PK columns, should fail -create table t1 ( - a int, - b int, - c int, - d int, - e varchar(200), - f int, - g char(20), - h text, - i int, - primary key (a)) TABLESPACE ts1 engine = ndb; - ---error 1 ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - -drop table t1; - ---echo Different distribution keys, should pass - -create table t1 ( - a int, - b int, - c int, - d int, - e varchar(200), - f int, - g char(20), - h text, - i int, - primary key(a,b)) TABLESPACE ts1 engine = ndb partition by key(a); - ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT ---exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 2 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - -select * from t1 order by a; - -drop table t1; === added file 'mysql-test/suite/ndb/t/ndb_restore_schema_tolerance.test' --- a/mysql-test/suite/ndb/t/ndb_restore_schema_tolerance.test 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/ndb/t/ndb_restore_schema_tolerance.test 2011-02-22 03:29:24 +0000 @@ -0,0 +1,206 @@ +###################################################################### +# Test restoring backups into similar schemas +###################################################################### + +-- source include/have_ndb.inc +-- source include/ndb_default_cluster.inc + +--echo Test ndb_restore ability to ignore some schema differences + +use test; +create table t1 ( + a int, + b int, + c int, + d int, + e varchar(200), + f int, + g char(20), + h text, + i int, + primary key(a,b)) TABLESPACE ts1 engine = ndb; + +insert into t1 values + (1, 1, 1, 1, '1', 1, 'Rankin', 'Rebus', 1), + (2, 2, 2, 2, '2', 2, 'Doyle', 'Holmes', 2), + (3, 3, 3, 3, '3', 3, 'Burns', 'Mouse', 3), + (4, 4, 4, 4, '4', 4, 'Gibbon', 'Chris', 4), + (5, 5, 5, 5, '5', 5, 'Gray', 'Lanark', 5); + +select * from t1 order by a; + +--echo Backing up data +--source include/ndb_backup.inc + +drop table t1; + +--echo Normal restore +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r -m $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 2 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT + +show create table t1; + +select * from t1 order by a; + +truncate t1; + +--echo Column name change, should fail without --exclude-missing-columns + +alter table t1 change c cc int; + +--error 1 +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT + +--echo Retry with --exclude-missing-columns + +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r --exclude-missing-columns $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 2 -r --exclude-missing-columns $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT + +select * from t1 order by a; +truncate t1; + +--echo Column type change, should fail + +alter table t1 change cc c bigint; +show create table t1; #REMOVE! +--error 1 +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT + +--echo Retry with --promote-attribute + +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r --promote-attribute $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 2 -r --promote-attribute $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT + +select * from t1 order by a; +truncate t1; + +--echo Column nullability change, should fail + +alter table t1 change c c int not null; + +--error 1 +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT + +alter table t1 change c c int; + +# Skip Precision and scale differences - should fail + +--echo Column length change, should fail + +alter table t1 change g g char(22); + +--error 1 +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT + +--echo Character set difference, should fail + +alter table t1 change g g char(20) character set binary; + +--error 1 +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT + +alter table t1 change g g char(20); + +--echo AutoIncrement difference, should fail + +alter table t1 change b b int auto_increment; + +--error 1 +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT + +--echo Default difference, should pass +alter table t1 change b b int default 22; + +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 2 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT + +select * from t1 order by a; +truncate t1; + +alter table t1 change b b int; + +--echo ArrayType difference, should fail +alter table t1 change e e varchar(300); + +--error 1 +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT + +alter table t1 change e e varchar(200); + +--echo StorageType difference, should pass +CREATE LOGFILE GROUP lg1 +ADD UNDOFILE 'undofile.dat' +INITIAL_SIZE 16M +UNDO_BUFFER_SIZE = 1M +ENGINE=NDB; + +CREATE TABLESPACE ts1 +ADD DATAFILE 'datafile.dat' +USE LOGFILE GROUP lg1 +INITIAL_SIZE 12M +ENGINE NDB; + +alter table t1 change i i int storage disk; + +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 2 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT + +select * from t1 order by a; + +alter table t1 change i i int storage memory; +truncate t1; + +# Skip BlobType difference (should fail) + +--echo Dynamic property difference, should pass + +alter table t1 change c c int column_format dynamic; + +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 2 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT + +select * from t1 order by a; + +drop table t1; +alter tablespace ts1 drop datafile 'datafile.dat' engine=ndb; +drop tablespace ts1 engine=ndb; +drop logfile group lg1 engine=ndb; + +--echo Different PK columns, should fail +create table t1 ( + a int, + b int, + c int, + d int, + e varchar(200), + f int, + g char(20), + h text, + i int, + primary key (a)) TABLESPACE ts1 engine = ndb; + +--error 1 +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT + +drop table t1; + +--echo Different distribution keys, should pass + +create table t1 ( + a int, + b int, + c int, + d int, + e varchar(200), + f int, + g char(20), + h text, + i int, + primary key(a,b)) TABLESPACE ts1 engine = ndb partition by key(a); + +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 1 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_RESTORE --no-defaults --core-file=false -b $the_backup_id -n 2 -r $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT + +select * from t1 order by a; + +drop table t1; --===============1364137427832553460== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/martin.zaun@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@stripped # target_branch: file:///Users/mz/mysql/ndb-7.0/ # testament_sha1: 14595a9c9b09ef991d0eb83700d9c882c12bc7c7 # timestamp: 2011-02-22 14:33:27 -0800 # source_branch: file:///Users/mz/mysql/ndb-7.0-ndb_restore-test-\ # cleanup/ # base_revision_id: ole.john.aske@stripped\ # a5t991325ifdf3wz # # Begin bundle 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 HaZo --===============1364137427832553460==--