bzr commit into mysql-trunk branch (saikumar.v:4829) Bug#14785826

[Saikumar V]

#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


Attachment: [text/bzr-bundle] bzr/[e-mail]