From: Saikumar V
Date: October 26 2012 8:25pm
Subject: bzr commit into mysql-trunk branch (saikumar.v:4829) Bug#14785826
List-Archive: http://lists.mysql.com/commits/145116
X-Bug: 14785826
Message-Id: <201210262026.q9QKQLBc002372@saikumar-laptop>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0803908645=="

--===============0803908645==
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-trunk/ based on revid:guilhem.bichot@stripped

 4829 Saikumar V	2012-10-27
      temporary fix for bug#14785826

    removed:
      mysql-test/r/not_ndb_default.require
    modified:
      mysql-test/include/not_ndb_default.inc
=== 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-26 20:24:59 +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


--===============0803908645==
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-trunk/
# testament_sha1: 011aab150336b307d6fd0099d9b073d4820e04bd
# timestamp: 2012-10-27 01:55:21 +0530
# base_revision_id: guilhem.bichot@stripped\
#   utoxpi3w4mdi1pq4
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQHuKCYAAYLfgAAQeOf/916l
nwD////6UAPnc5Uc9zu7Up1BoUyKe1NT1PKeo9Gk9R5IZAAzUbCTYpmUElJimE8jJqZFPaUbUabU
NNBoYmgAASRAgBGmpiG1J6J6oHppBgAj1ACFIyGCaaYAnqAGTAAEZAAEkiU/SnkjxT1PU09TEB6n
pHqaaaMTRoAAxzivbGOmKGPFagyFxA2YCIhLRJFzNJq2UMhi2FZSLuxyY00aEba1/UHhdPviuEC2
gMMJ03dC9eVhqMGFIDyZpmSX5S2lBwFCBO1qUMKLZQ7r86MQGJgmAhKA7QxkZb78AJL5SFzk1+C7
8Ei9cEtuV8uUVd+T/ifgdXGampCHVBxOgZsh4sORN/iE0/nCXmNK3/ZXohlNfey996RXxOXrnW3z
vo9BClVtmWpxCa4HV0wptTKWZnXplZNRlvjbXUMW+viCwFXmqD0EqNE3KpBTKsfiwN38IH7KPkWt
1vJFjadsexd/UoGwottM3pHRpCxJvDBos5sM/8XA4qYsvAK3XnPY4L4VDXzNMGJtgnGlvVsNxpc9
q2lxig4mBbw45bZMFCzrsMyeRDLMgwzctZq65VC0sa8m20x2DlKxXxLLIyL7ZlonqhWGyu2FhKMc
6E93Q1FVlhMax76sbk82dic4JnueRUFIVP5G749LOZpjLuq8fYWBbpYEW8MfMjCW9cCVE3fwosW4
py/+UPxOCliniPPkXYxoPm9qKASxoZgGVVaAWy+4UB32gsVZGV0EQ5jaYVlL0pzvaiENbJSIfoet
JpSsyaCejNmM5nHv3epTf7my7F2M7zlz+1b1C+mLiBjqlfM1wdkSfdoD2MSKoTSLPHXhPw1Z67li
alU1NqCZQwJTP8veU4LxHfH+/mYGkj0Qho+2ILXOVOto9MOO7wZ5ljBbfE5HNu13xzvna6Rc7js5
t8UDxQSymekUkYCno0zRytyyN7TRQCEkVZSUJSFzEKyM/rN0sOgmwRLH7DQKrVwsKMLh0FrzKBXv
JeCkuhkpb25LtXgZnRbL+aaqys2Adi0Ui+NcpLQxhLlxb76wgXrz7Q5Jn4HFTGUmJcLNf3Ar8tBx
cwKC8+QayDGERMtuVV6QyLN24CquZ2+nxEXJuFQEl3K2Nxv4VSkVwfuoQGYyNkF1lTo3rW4I2lCS
f1ccsSNhlicqKagWSIGeRdiRYBzvTOvJc1lBVnDVVG/izKJTvT26epTx5Elb4ibTsuZ2SZaigkGr
RRjsu5wN1erVLSGHGUpWurY5yx+xqNj91d1roM5mXuClTvuKK4xizoIolsLiKNssTymbE3JNi65E
iD0fKyTDMVU7KEKAVq5NnN1p3HULDSzDxOHNzrl5K0vMBhjLXNdKTVvDAd1rZiLiblWroiiE7/WZ
HLIpeO19B/xdyRThQkAHuKCY


--===============0803908645==--