List:Commits« Previous MessageNext Message »
From:Anitha Gopi Date:December 21 2010 6:21pm
Subject:bzr push into mysql-trunk-bugfixing branch (anitha.gopi:3464 to 3465)
Bug#59055
View as plain text  
 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
 3464 Tor Didriksen	2010-12-21 [merge]
      automerge 5.5-bugteam => trunk-bugfixing

    modified:
      cmake/os/SunOS.cmake
      config.h.cmake
      configure.cmake
      include/my_pthread.h
      include/mysql/psi/mysql_file.h
      mysys/ptr_cmp.c
      sql/my_decimal.cc
      sql/mysqld.cc
      sql/sql_audit.h
      sql/sql_plugin.h
      sql/sql_show.cc
      sql/sys_vars.h
      storage/perfschema/pfs_instr.cc
=== 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


Attachment: [text/bzr-bundle] bzr/anitha.gopi@sun.com-20101221181537-z4wblu7z015e3w84.bundle
Thread
bzr push into mysql-trunk-bugfixing branch (anitha.gopi:3464 to 3465)Bug#59055Anitha Gopi21 Dec