From: Anitha Gopi
Date: December 21 2010 6:01pm
Subject: bzr commit into mysql-trunk-mtr branch (anitha.gopi:3455) Bug#59055
List-Archive: http://lists.mysql.com/commits/127461
X-Bug: 59055
Message-Id: <0LDS00D4RI2ZBQE0@fe-emea-10.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_3RP6uY7vFVIECCF6f5cetw)"

--Boundary_(ID_3RP6uY7vFVIECCF6f5cetw)
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-trunk-bugfixing/ based on revid:anitha.gopi@stripped

 3455 Anitha Gopi	2010-12-21
      BUG #59055: Up merge revision 3225 from mysql-5.5-bugteam

    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-11-04 10:32:57 +0000
+++ b/mysql-test/lib/v1/mysql-test-run.pl	2010-12-21 17:59:51 +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:59:51 +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:59:51 +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:59:51 +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_3RP6uY7vFVIECCF6f5cetw)
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-trunk-bugfixing/
# testament_sha1: 14be0d0ca365f8f5adaf67661d9e31e43246f14b
# timestamp: 2010-12-21 23:31:09 +0530
# source_branch: file:///home/anitha/mysql/repo/mysql-5.5-bugteam/
# base_revision_id: anitha.gopi@stripped\
#   cbegojpu48gqiw8r
# 
# Begin bundle
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


--Boundary_(ID_3RP6uY7vFVIECCF6f5cetw)--