From: Anitha Gopi
Date: December 21 2010 6:16pm
Subject: bzr commit into mysql-trunk-bugfixing branch (anitha.gopi:3465)
 Bug#59055
List-Archive: http://lists.mysql.com/commits/127462
X-Bug: 59055
Message-Id: <0LDS0053OISWZ860@fe-emea-09.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_j+dla8o27lVW8qstvVvwsA)"

--Boundary_(ID_j+dla8o27lVW8qstvVvwsA)
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:tor.didriksen@stripped

 3465 Anitha Gopi	2010-12-21 [merge]
      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 18:15:37 +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_j+dla8o27lVW8qstvVvwsA)
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: a09fffba452a3f6d6b2ce559e3bbdfb6a59d6a1d
# timestamp: 2010-12-21 23:47:05 +0530
# source_branch: file:///home/anitha/mysql/repo/mysql-5.5-bugteam/
# base_revision_id: tor.didriksen@stripped\
#   ri0jgqgqweybct6b
# 
# Begin bundle
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


--Boundary_(ID_j+dla8o27lVW8qstvVvwsA)--