List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:February 2 2011 10:34am
Subject:bzr push into mysql-5.5-telco-7.0 branch (magnus.blaudd:3168 to 3169)
View as plain text  
 3169 Magnus Blåudd	2011-02-02
      ndb
       - add include file to check for ALTER [ONLINE|OFFLINE] syntax support
       - include it in tests which rely on this functionality

    added:
      mysql-test/include/ndb_have_online_alter.inc
    modified:
      mysql-test/suite/ndb/t/ndb_add_partition.test
      mysql-test/suite/ndb/t/ndb_addnode.test
      mysql-test/suite/ndb/t/ndb_alter_table_online.test
      mysql-test/suite/ndb/t/ndb_alter_table_online2.test
      mysql-test/suite/ndb/t/ndb_database.test
      mysql-test/suite/ndb/t/ndb_native_default_support.test
 3168 Magnus Blåudd	2011-02-02
      ndb
       - remove code for which supports runing without --ndb-log-empty-epoch
       -  injector::rollback now supporte in 5.5-telco-7.0 and trunk

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_glue.h
=== added file 'mysql-test/include/ndb_have_online_alter.inc'
--- a/mysql-test/include/ndb_have_online_alter.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/ndb_have_online_alter.inc	2011-02-02 10:33:25 +0000
@@ -0,0 +1,25 @@
+#
+# Check if the MySQL Server have support for
+#  ALTER [ONLINE|OFFLINE] TABLE syntax
+#
+--disable_query_log
+--disable_result_log
+let $have_online_alter = 1;
+CREATE TABLE check_online_alter(a int primary key);
+--error 0,1064
+ALTER ONLINE TABLE check_online_alter ADD COLUMN b int;
+if($mysql_errno)
+{
+  let $have_online_alter= 0;
+}
+
+# Cleanup
+DROP TABLE check_online_alter;
+
+--enable_query_log
+--enable_result_log
+
+if (!$have_online_alter)
+{
+  skip Need ALTER ONLINE syntax;
+}

=== modified file 'mysql-test/suite/ndb/t/ndb_add_partition.test'
--- a/mysql-test/suite/ndb/t/ndb_add_partition.test	2009-02-12 15:21:46 +0000
+++ b/mysql-test/suite/ndb/t/ndb_add_partition.test	2011-02-02 10:33:25 +0000
@@ -1,4 +1,5 @@
--- source include/have_ndb.inc
+--source include/ndb_have_online_alter.inc
+--source include/have_ndb.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1,t2;

=== modified file 'mysql-test/suite/ndb/t/ndb_addnode.test'
--- a/mysql-test/suite/ndb/t/ndb_addnode.test	2010-01-27 10:08:37 +0000
+++ b/mysql-test/suite/ndb/t/ndb_addnode.test	2011-02-02 10:33:25 +0000
@@ -1,3 +1,4 @@
+--source include/ndb_have_online_alter.inc
 -- source include/have_ndb.inc
 -- source include/not_embedded.inc
 --result_format 2

=== modified file 'mysql-test/suite/ndb/t/ndb_alter_table_online.test'
--- a/mysql-test/suite/ndb/t/ndb_alter_table_online.test	2011-01-21 10:29:46 +0000
+++ b/mysql-test/suite/ndb/t/ndb_alter_table_online.test	2011-02-02 10:33:25 +0000
@@ -7,6 +7,7 @@
 # Date 2006-08-28
 # Purpose: Add more testing for online alter
 ##############################################################
+--source include/ndb_have_online_alter.inc
 --source include/have_multi_ndb.inc
 
 --disable_warnings

=== modified file 'mysql-test/suite/ndb/t/ndb_alter_table_online2.test'
--- a/mysql-test/suite/ndb/t/ndb_alter_table_online2.test	2009-10-09 15:48:57 +0000
+++ b/mysql-test/suite/ndb/t/ndb_alter_table_online2.test	2011-02-02 10:33:25 +0000
@@ -8,7 +8,7 @@
 # Purpose: Add testing for online alter w/partitions
 #          and some original test cleanup and additions
 ##############################################################
-
+--source include/ndb_have_online_alter.inc
 -- source include/have_multi_ndb.inc
 # test uses mysqlslap, hence not in embedded
 -- source include/not_embedded.inc

=== modified file 'mysql-test/suite/ndb/t/ndb_database.test'
--- a/mysql-test/suite/ndb/t/ndb_database.test	2010-09-22 12:06:29 +0000
+++ b/mysql-test/suite/ndb/t/ndb_database.test	2011-02-02 10:33:25 +0000
@@ -1,3 +1,4 @@
+--source include/ndb_have_online_alter.inc
 -- source include/have_ndb.inc
 
 --disable_warnings

=== modified file 'mysql-test/suite/ndb/t/ndb_native_default_support.test'
--- a/mysql-test/suite/ndb/t/ndb_native_default_support.test	2010-11-10 13:39:11 +0000
+++ b/mysql-test/suite/ndb/t/ndb_native_default_support.test	2011-02-02 10:33:25 +0000
@@ -3,7 +3,7 @@
 # Date: 2008-12
 # Purpose: ndb native default support test
 ##############################################################
-
+--source include/ndb_have_online_alter.inc
 -- source include/have_ndb.inc
 -- source include/ndb_default_cluster.inc
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-telco-7.0 branch (magnus.blaudd:3168 to 3169) Magnus Blåudd2 Feb