From: Saikumar V
Date: October 27 2012 6:58am
Subject: bzr commit into mysql-5.6 branch (saikumar.v:4484) Bug#14785826
List-Archive: http://lists.mysql.com/commits/145115
X-Bug: 14785826
Message-Id: <201210270659.q9R6xPeq003538@saikumar-laptop>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0404300268=="

--===============0404300268==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

 4484 Saikumar V	2012-10-27
      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


--===============0404300268==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/saikumar.v@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: saikumar.v@stripped
# target_branch: file:///home/saikumar/work/opt-test/push/mysql-5.6/
# testament_sha1: 8cfc38174925beeebda34d1e82d04e081e40f198
# timestamp: 2012-10-27 12:28:24 +0530
# base_revision_id: guilhem.bichot@stripped\
#   2axj3ajw14vvzp2e
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQwLBkwAAjbfgAAweOf/93/n
38D////6UAWGntza6ZpHu3d05u23u1wSSI0TQnoxNMgmmmTRpR5J+ptU0z0NQyI8oP1QSkmjVP1R
+lPxMlPSDIABoaAA0AAAEoQTECaaCBoGmpoGgAAaaNDTGoGKKaeqep5pR6aj9KejSZHlA00AANAA
ABJImmiYE1PCZQTanqepp6jQ0ABoAAB345T5l6/ao/zNXiycmepzFeg9WsKGRsz2Ydmdnpnu6sS8
pGi7/PjRJmONTMy/PoveKRn1D32xmN9EkY8u+PftODU/r7zkbDn7NG/mk7rrY2aWNm3Vuvovu4C1
SCpZU4j2QBr7WqWVmvq7MGHT76dFq6c4OYRrwYz64d26nU2hjb+bJ9XxIVlZWhYlJzxGMm09Gk9o
HOBq30l+Xuuvk78CrjEr6dKGnKgwNdkxtKWgLpbHBWPdAO6cTklKrt45PYDFxO9hYFQ9QGH1yiPJ
G0CAPDsINn5oxuEry2+PoZBMqNK8BXDFB1lTKRE+Sooa6dynJUPcBgzAUmJOB8i5LpPtrjdacd+V
5+QSImfAYsKBd8rvNFlikZqIMFAmUNKhyRPM4NCEyzvYz0NSfrdSMBIOJyh8iY2IXJdgmSZ3lgFD
X3EQN6rOUGBz7OPQMhfJltm4hh5HSlPOW8t2RoAZuNg1Uqkr1qE7HUPHLUzmoXOOHwOayw6aZFWX
YVZKCBewHKnNHjYuYsthojZRGowQOfAju6Cu2507WGozuUxItpXbUSAQujbdKyIROSWnHPmuIYsX
DiweBQMVXxGeFjh+sgpLQcb+mVzWQGxg5AoLccJfUWuKlGWyqltpDKUYWY6cM0BJXK5J8CyflIZL
6FALfjju5JRxZrKMRtwRmizmUcbwaEjoKVEsjblNw7M11hm7CxGzxP0/Y8yPRMuSC30Fl4qKqs46
vN6+V7z59apKf67+2nS1Jdx+9r4Nt7r47SFeTtodLjbL8wFKTdqcfjDAiRNxZzryjP3BdC0hdVhH
NV/z/grTPrYcN4ORxevX77I4geyge2b6EYvjcA+t/aXfgZ/nLJxuB5dwl/BNvd8iIgyWLQnoOF5W
l5iyWUJ2EcyW7xeM2QupfNbKTgY6RjCcHqu1QsddOKeB6uoI8hhw9BF8GcTSShoy1m4HubWi9IEt
lmBL8e6HSr2jKu3nkpJ4EaQcRBz0PlHhgdnEyLiq1XnUvWOwdK8vQ9DqOoq9rnqVGWU2GWKJ1MUV
rkBVJBzm1bNZ1muC61aomKg/VdrKjMdaxknHbkXk4m4715IiGeEOdY9rBOBfsSyHEUBImTtqZggt
dOx13eVBiuEfwYQ2LQNIY78TDMgSZGEyXOT3I39yugrVB/SjgMbzpMOxIUcApRCI506FTzeRMQFI
ZQM802ZUIwZni7aUy3EHHcECIsCkEC4LaN62ZEJ0dhoANBMCyIVFKcx+5GQJttZHu0WQtRXMT39u
IClfiXtRvl6cjcoFOUyFavuHGRWFGhqKH2oveEpv6wWfv7tQa7iKsMQQWaqYZpxJgcmBqubQCooi
aW+JCqTbtr50KVUElRpIcuWqNSN4W2E0eKqZTEcHISYSadTBUoXhPUdDHDCE2Q5g6HKjViqxpLsg
hnngJRoJFncp1rWGSyZW9AqVQZ2Z6MMEVRQFnHfLeQ5DvAbC1R8AGYOGQKnK1qIhgyJkzXcrk0wn
l4sXVpYb0IrOg3BIkuoDwSJlSRY7LXQoEn7GmiieFrZtqtm9ZFUhiGGgpglioE7M3WpxTy3xi8iJ
zms34ayo6yqRnKOtZ4iD1kCA40OWp2N8RUFwZISpeOlBUCsFgwUfzFmeVjaj5abmlbebXMl0IT5J
57/agdzkSoyowmhOO1RAQ3KM2VaSxOA4wLluJtkCpFzlADEDLIrtJzyZLihVXNECxcBh1ty6D/i7
kinChIBgWDJg


--===============0404300268==--