From: Saikumar V
Date: October 27 2012 7:01am
Subject: bzr commit into mysql-trunk branch (saikumar.v:4829) Bug#14785826
List-Archive: http://lists.mysql.com/commits/145114
X-Bug: 14785826
Message-Id: <201210270702.q9R729EJ003569@saikumar-laptop>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/saikumar/work/opt-test/push/mysql-trunk/ based on revid:guilhem.bichot@stripped

 4829 Saikumar V	2012-10-27 [merge]
      Bug#14785826: Fixing depricated server variable use in inc file.
      Disabling two failing rpl tests(RPL_SWITCH_STM_ROW_MIXED AND RPL_INSERT_ID) due to this.

    removed:
      mysql-test/r/not_ndb_default.require
    modified:
      mysql-test/include/not_ndb_default.inc
      mysql-test/suite/rpl/t/disabled.def
=== modified file 'mysql-test/include/not_ndb_default.inc'
--- a/mysql-test/include/not_ndb_default.inc	2011-04-15 08:55:50 +0000
+++ b/mysql-test/include/not_ndb_default.inc	2012-10-27 06:58:14 +0000
@@ -1,4 +1,6 @@
---require r/not_ndb_default.require
-disable_query_log;
-select convert(@@storage_engine using latin1) NOT IN ("ndbcluster","NDBCLUSTER") as "TRUE";
-enable_query_log;
+# Skip the test in case the default storage engine is NDB.
+
+if (`SELECT CONVERT(@@default_storage_engine USING latin1) IN ('ndbcluster','NDBCLUSTER')`)
+{
+  --skip Test requires default storage engine (@@default_storage_engine) != NDB
+}

=== removed file 'mysql-test/r/not_ndb_default.require'
--- a/mysql-test/r/not_ndb_default.require	2006-07-19 12:25:52 +0000
+++ b/mysql-test/r/not_ndb_default.require	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-TRUE
-1

=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2012-06-28 11:57:21 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2012-10-27 06:58:14 +0000
@@ -15,3 +15,5 @@ rpl_delayed_slave         : Bug#11764654
 rpl_row_until             : BUG#12359942 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
 rpl_stm_until             : BUG#12359942 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
 rpl_row_binlog_max_cache_size : BUG#14126780 May 29 2012 Vasil Dimov timeout if est number of rows is 3 instead of 4
+rpl_switch_stm_row_mixed  : BUG#14823837 Oct 27 2012 Saikumar
+rpl_insert_id             : BUG#14823837 Oct 27 2012 Saikumar

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).