From: Anitha Gopi
Date: December 21 2010 5:46pm
Subject: bzr commit into mysql-5.5-bugteam branch (anitha.gopi:3225) Bug#59055
List-Archive: http://lists.mysql.com/commits/127459
X-Bug: 59055
Message-Id: <0LDS00DUVHF6BQC0@fe-emea-10.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_6FnI5c1FMiBtnWU+9kIPFQ)"

--Boundary_(ID_6FnI5c1FMiBtnWU+9kIPFQ)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///home/anitha/mysql/repo/mysql-5.5-bugteam/ based on revid:tor.didriksen@stripped

 3225 Anitha Gopi	2010-12-21
      BUG #59055: RQG was broken after the checkin that removed rpl and rpl_ndb suites. RQG uses MTR V1 and that still has these in the default suite. Removing these from V1. Also removing references to ndb tests in some more disabled.def files

    modified:
      mysql-test/lib/v1/mysql-test-run.pl
      mysql-test/suite/funcs_1/t/disabled.def
      mysql-test/suite/funcs_2/t/disabled.def
      mysql-test/suite/parts/t/disabled.def
=== modified file 'mysql-test/lib/v1/mysql-test-run.pl'
--- a/mysql-test/lib/v1/mysql-test-run.pl	2010-08-05 12:53:09 +0000
+++ b/mysql-test/lib/v1/mysql-test-run.pl	2010-12-21 17:44:48 +0000
@@ -135,7 +135,7 @@ our $default_vardir;
 
 our $opt_usage;
 our $opt_suites;
-our $opt_suites_default= "main,binlog,rpl,rpl_ndb,ndb"; # Default suites to run
+our $opt_suites_default= "main,binlog,rpl"; # Default suites to run
 our $opt_script_debug= 0;  # Script debugging, enable with --script-debug
 our $opt_verbose= 0;  # Verbose output, enable with --verbose
 

=== modified file 'mysql-test/suite/funcs_1/t/disabled.def'
--- a/mysql-test/suite/funcs_1/t/disabled.def	2009-09-23 18:50:13 +0000
+++ b/mysql-test/suite/funcs_1/t/disabled.def	2010-12-21 17:44:48 +0000
@@ -10,4 +10,3 @@
 #
 ##############################################################################
 
-ndb_trig_1011ext:  Bug#47564

=== modified file 'mysql-test/suite/funcs_2/t/disabled.def'
--- a/mysql-test/suite/funcs_2/t/disabled.def	2010-08-19 07:31:24 +0000
+++ b/mysql-test/suite/funcs_2/t/disabled.def	2010-12-21 17:44:48 +0000
@@ -1,4 +1 @@
-# Should maybe be enabled, but ndb is not part of the ordinary build. 
-# Bernt M. Johnsen 2010-05-10
-ndb_charset    : Bug#20447 Problem with prefix keys with contractions and expansions
 

=== modified file 'mysql-test/suite/parts/t/disabled.def'
--- a/mysql-test/suite/parts/t/disabled.def	2009-09-23 18:50:13 +0000
+++ b/mysql-test/suite/parts/t/disabled.def	2010-12-21 17:44:48 +0000
@@ -1,3 +0,0 @@
-partition_basic_ndb            : Bug#44919 parts-suite in mtr tries to use features not supported by ndb
-# http://dev.mysql.com/doc/refman/5.1/en/mysql-cluster-limitations-syntax.html
-partition_syntax_ndb           : Bug#36735 Not supported


--Boundary_(ID_6FnI5c1FMiBtnWU+9kIPFQ)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/anitha.gopi@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/anitha.gopi@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: anitha.gopi@stripped
# target_branch: file:///home/anitha/mysql/repo/mysql-5.5-bugteam/
# testament_sha1: 479db90c3b6bdfbde384e25e0caf015dfebe9ab5
# timestamp: 2010-12-21 23:17:00 +0530
# base_revision_id: tor.didriksen@stripped\
#   0ycsvkloucokx2kq
# 
# Begin bundle
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


--Boundary_(ID_6FnI5c1FMiBtnWU+9kIPFQ)--