bzr push into mysql-5.1-telco-6.4 branch (tomas.ulin:2866 to 2867)

[Tomas Ulin]

 2867 Tomas Ulin	2009-02-18 [merge]
      merge
      added:
        mysql-test/include/ndb_backup_id.inc
      modified:
        mysql-test/include/ndb_backup.inc
        mysql-test/suite/ndb_team/r/ndb_autodiscover3.result
        mysql-test/suite/ndb_team/t/ndb_autodiscover3.test

 2866 Jonas Oreland	2009-02-18 [merge]
      merge 63 to 64
      modified:
        storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp

=== modified file 'mysql-test/include/ndb_backup.inc'
--- a/mysql-test/include/ndb_backup.inc	2009-02-16 16:04:50 +0000
+++ b/mysql-test/include/ndb_backup.inc	2009-02-18 21:09:24 +0000
@@ -4,21 +4,4 @@
 ######################################################
 --exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "start backup" >> $NDB_TOOLS_OUTPUT
 
-# there is no neat way to find the backupid, this is a hack to find it...
-let $dump_file= $MYSQLTEST_VARDIR/tmp/tmp.dat;
---exec $NDB_SELECT_ALL --ndb-connectstring="$NDB_CONNECTSTRING" -d sys --delimiter=, SYSTAB_0 | grep 520093696 > $dump_file
-
-CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
-
-# needed for embedded
---chmod 0777 $dump_file
---replace_result $dump_file DUMP_FILE
-eval LOAD DATA INFILE '$dump_file' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
-
-# Load backup id into environment variable
-let the_backup_id=`SELECT  backup_id from test.backup_info`;
-DROP TABLE test.backup_info;
-
-remove_file $dump_file;
-
-
+--souce include/ndb_backup_id.inc

=== added file 'mysql-test/include/ndb_backup_id.inc'
--- a/mysql-test/include/ndb_backup_id.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/ndb_backup_id.inc	2009-02-18 21:09:24 +0000
@@ -0,0 +1,16 @@
+# there is no neat way to find the backupid, this is a hack to find it...
+--let $dump_file= $MYSQLTEST_VARDIR/tmp/tmp.dat
+--exec $NDB_SELECT_ALL -d sys --delimiter=, SYSTAB_0 | grep 520093696 > $dump_file
+
+CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
+
+# needed for embedded
+--exec chmod 0777 $dump_file
+--replace_result $dump_file DUMP_FILE
+eval LOAD DATA INFILE '$dump_file' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
+
+# Load backup id into environment variable
+let the_backup_id=`SELECT  backup_id from test.backup_info`;
+DROP TABLE test.backup_info;
+
+--remove_file $dump_file

=== modified file 'mysql-test/suite/ndb_team/r/ndb_autodiscover3.result'
--- a/mysql-test/suite/ndb_team/r/ndb_autodiscover3.result	2008-10-15 12:24:10 +0000
+++ b/mysql-test/suite/ndb_team/r/ndb_autodiscover3.result	2009-02-18 20:19:11 +0000
@@ -13,6 +13,9 @@ a	b
 1	1
 2	1
 3	1
+CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
+LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
+DROP TABLE test.backup_info;
 select * from t2;
 ERROR 42S02: Table 'test.t2' doesn't exist
 show tables like 't2';
@@ -31,6 +34,9 @@ a
 2
 3
 reset master;
+CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
+LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
+DROP TABLE test.backup_info;
 select * from t2;
 ERROR 42S02: Table 'test.t2' doesn't exist
 show tables like 't2';

=== modified file 'mysql-test/suite/ndb_team/t/ndb_autodiscover3.test'
--- a/mysql-test/suite/ndb_team/t/ndb_autodiscover3.test	2008-10-16 10:16:45 +0000
+++ b/mysql-test/suite/ndb_team/t/ndb_autodiscover3.test	2009-02-18 21:09:24 +0000
@@ -54,8 +54,12 @@ create table t2 (a int, b int, primary k
 insert into t2 values (1,1),(2,1),(3,1),(4,1),(5,1),(6,1),(7,1),(8,1),(9,1),(10,1);
 select * from t2 order by a limit 3;
 
+--source include/ndb_backup_id.inc
 --exec $NDB_MGM --no-defaults -e "all restart -i" >> $NDB_TOOLS_OUTPUT
 --exec $NDB_WAITER --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT
+--inc $the_backup_id
+--sleep 3
+--exec $NDB_MGM --no-defaults -e "start backup $the_backup_id" >> $NDB_TOOLS_OUTPUT
 # to ensure mysqld has connected again, and recreated system tables
 --disable_query_log
 --connection con1
@@ -78,8 +82,12 @@ select * from t2 order by a limit 3;
 select * from t2 order by a limit 3;
 reset master;
 
+--source include/ndb_backup_id.inc
 --exec $NDB_MGM --no-defaults -e "all restart -i" >> $NDB_TOOLS_OUTPUT
 --exec $NDB_WAITER --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT
+--inc $the_backup_id
+--sleep 3
+--exec $NDB_MGM --no-defaults -e "start backup $the_backup_id" >> $NDB_TOOLS_OUTPUT
 # to ensure mysqld has connected again, and recreated system tables
 --disable_query_log
 --connection con1