bzr push into mysql-pe branch (joro:3609 to 3610)

[Georgi Kodinov]

 3610 Georgi Kodinov	2009-09-23 [merge]
      automerge

 3609 Georgi Kodinov	2009-09-23 [merge]
      automerge

    modified:
      sql/sql_select.cc
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2009-09-22 18:28:01 +0000
+++ b/.bzr-mysql/default.conf	2009-09-23 08:41:13 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-6.0"
+tree_name = "mysql-pe"

=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2009-09-22 18:28:01 +0000
+++ b/client/mysqltest.cc	2009-09-23 08:41:13 +0000
@@ -1535,7 +1535,7 @@ void show_diff(DYNAMIC_STRING* ds,
   else
     diff_name = 0;
 #else
-  diff_name = "diff";		// Otherwise always assume it's called diff
+  diff_name = "diff";           /* Otherwise always assume it's called diff */
 #endif
 
   if (diff_name)

=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2009-09-22 18:28:01 +0000
+++ b/mysql-test/collections/default.experimental	2009-09-23 08:41:13 +0000
@@ -6,8 +6,7 @@ backup.backup_datatypes  @darwin        
 binlog.binlog_tmp_table*                 # Bug#45578 2009-07-10 alik Test binlog_tmp_table fails ramdonly on PB2: Unknown table 't2'
 
 funcs_1.charset_collation_1              # depends on compile-time decisions
-
-main.ctype_gbk_binlog  @solaris          # Bug#46010: main.ctype_gbk_binlog fails sporadically : Table 't2' already exists
+main.plugin_load  @solaris               # Bug#42144
 main.truncate_coverage                   # Bug#46785 2009-08-18 alik main.truncate_coverage fails sporadically
 
 rpl.rpl_backup_multi*                    # BUG#45284
@@ -19,11 +18,11 @@ innodb.innodb_information_schema        
 main.lock_multi_bug38499                 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically
 main.information_schema                  # Bug#47449 2009-09-19 alik main.information_schema and innodb.innodb_information_schema fail sporadically
 
+rpl.rpl_row_create_table*                # Bug#45576: rpl_row_create_table fails on PB2
 rpl_ndb.rpl_ndb_log                      # Bug#38998
 rpl.rpl_innodb_bug28430* @solaris        # Bug#46029
 main.plugin_load  @solaris               # Bug#47146
 rpl.rpl_get_master_version_and_clock*    # Bug#46931 2009-08-26 alik rpl.rpl_get_master_version_and_clock fails on hpux11.31
-
 ndb.ndb_restore                          # Bug#37778 2009-07-30 alik ndb.ndb_restore fails randomly
 ndb.ndb_restore_print                    # Bug#37778 2009-07-30 alik ndb.ndb_restore fails randomly
 main.plugin*  @solaris                   # Bug#47146 Linking problem with example plugin when dtrace enabled

=== modified file 'mysql-test/include/mtr_warnings.sql'
--- a/mysql-test/include/mtr_warnings.sql	2009-09-22 18:28:01 +0000
+++ b/mysql-test/include/mtr_warnings.sql	2009-09-23 08:41:13 +0000
@@ -162,7 +162,7 @@ INSERT INTO global_suppressions VALUES
  ("Slave: Unknown column 'c7' in 't15' Error_code: 1054"),
  ("Slave: Can't DROP 'c7'.* 1091"),
  ("Slave: Key column 'c6'.* 1072"),
- ("The slave I.O thread stops because a fatal error is encountered when it try to get the value of SERVER_ID variable from master."),
+ ("Slave I/O: The slave I/O thread stops because a fatal error is encountered when it try to get the value of SERVER_ID variable from master."),
  (".SELECT UNIX_TIMESTAMP... failed on master, do not trust column Seconds_Behind_Master of SHOW SLAVE STATUS"),
 
  /* Test case for Bug#31590 in order_by.test produces the following error */

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-09-22 18:28:01 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-09-23 08:41:13 +0000
@@ -1825,7 +1825,7 @@ sub environment_setup {
     my $plugin_filename;
     if (IS_WINDOWS)
     {
-       $plugin_filename = "ha_example.dll"; 
+       $plugin_filename = "ha_example.dll";
     }
     else 
     {

=== added file 'mysql-test/suite/innodb/include/have_innodb_plugin.inc'
--- a/mysql-test/suite/innodb/include/have_innodb_plugin.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/innodb/include/have_innodb_plugin.inc	2009-09-23 11:10:33 +0000
@@ -0,0 +1 @@
+skip no innodb plugin for mysql-6.0-codebase;


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