Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.

mysql-test/collections/default.experimental

@@ -15,14 +15,12 @@ main.log_tables                          # Bug#47924 2009-10-08 alik main.log_ta
 main.plugin                              # Bug#47146 Linking problem with example plugin when dtrace enabled
 main.plugin_load                         # Bug#47146
 
-rpl.rpl_cross_version*                   # Bug #43913 2009-10-26 joro rpl_cross_version can't pass on conflicts complainig clash with --slave-load-tm
+rpl.rpl_cross_version*                   # Bug#48340 2009-12-01 Daogang rpl_cross_version: Found warnings/errors in server log file!
+rpl.rpl_get_master_version_and_clock*    # Bug #49191 2009-12-01 Daogang rpl_get_master_version_and_clock failed on PB2: COM_REGISTER_SLAVE failed
 rpl.rpl_innodb_bug28430*                 # Bug#46029
 rpl.rpl_innodb_bug30888* @solaris        # Bug#47646 2009-09-25 alik rpl.rpl_innodb_bug30888 fails sporadically on Solaris
-rpl.rpl_log_pos*                         # Bug#47743 2009-10-02 alik rpl.rpl_log_pos fails sporadically
 rpl.rpl_plugin_load*  @solaris           # Bug#47146
-rpl.rpl_row_create_table*                # Bug#45576: rpl_row_create_table fails on PB2
 rpl.rpl_timezone*                        # Bug#47017 2009-10-27 alik rpl_timezone fails on PB-2 with mismatch error
-rpl.rpl_trigger*                         # Bug#46656 2009-09-25 alik InnoDB plugin: memory leaks (Valgrind)
 
 # Declare all NDB-tests in ndb and rpl_ndb test suites experimental.
 # Usually the test cases from ndb and rpl_ndb test suites are not run in PB,
@@ -31,6 +29,7 @@ rpl.rpl_trigger*                         # Bug#46656 2009-09-25 alik InnoDB plug
 
 ndb.*
 rpl_ndb.*
+rpl_ndb.rpl_ndb_log                      # Bug#38998
 
 # Declare all NDB-tests in other test suites experimental.
 
@@ -64,17 +63,17 @@ funcs_1.ndb_cursors
 
 funcs_2.ndb_charset
 
-parts.partition_engine_ndb
-parts.ndb_dd_backuprestore
-parts.partition_value_ndb
-parts.partition_mgm_lc2_ndb
-parts.partition_alter1_2_ndb
-parts.partition_alter1_1_ndb
-parts.part_supported_sql_func_ndb
-parts.partition_int_ndb
-parts.partition_mgm_lc1_ndb
-parts.partition_auto_increment_ndb
-parts.partition_syntax_ndb
-parts.partition_alter1_1_2_ndb
-parts.partition_basic_ndb
-parts.partition_mgm_lc0_ndb
+parts.ndb_dd_backuprestore               # joro : NDB tests marked as experimental as agreed with bochklin
+parts.part_supported_sql_func_ndb        # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_alter1_1_ndb             # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_alter1_1_2_ndb           # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_alter1_2_ndb             # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_auto_increment_ndb       # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_basic_ndb                # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_engine_ndb               # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_int_ndb                  # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_mgm_lc0_ndb              # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_mgm_lc1_ndb              # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_mgm_lc2_ndb              # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_syntax_ndb               # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_value_ndb                # joro : NDB tests marked as experimental as agreed with bochklin

mysql-test/r/innodb_mysql.result

@@ -2273,35 +2273,4 @@ END|
 DROP PROCEDURE p1;
 DROP VIEW v1;
 DROP TABLE t1,t2;
-#
-# Bug #20837 Apparent change of isolation 
-#     level during transaction
-#
-SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
-CREATE TABLE t1 (s1 INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1),(2);
-COMMIT;
-SET @@autocommit = 0;
-COMMIT;
-SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-START TRANSACTION;
-SELECT * FROM t1;
-s1
-1
-2
-Should be READ UNCOMMITTED
-SELECT @@tx_isolation;
-@@tx_isolation
-READ-UNCOMMITTED
-INSERT INTO t1 VALUES (-1);
-Should be READ UNCOMMITTED
-SELECT @@tx_isolation;
-@@tx_isolation
-READ-UNCOMMITTED
-COMMIT;
-Should now be REPEATABLE READ
-SELECT @@tx_isolation;
-@@tx_isolation
-REPEATABLE-READ
-DROP TABLE t1;
 End of 5.1 tests

mysql-test/suite/rpl/t/disabled.def

@@ -11,3 +11,4 @@
 ##############################################################################
 
 rpl_get_master_version_and_clock:  # Bug#46931 2009-10-17 joro rpl.rpl_get_master_version_and_clock fails
+rpl_row_create_table    : Bug#45576 2009-12-01 joro rpl_row_create_table fails on PB2

mysql-test/t/innodb_mysql.test

@@ -536,30 +536,4 @@ DROP PROCEDURE p1;
 DROP VIEW v1;
 DROP TABLE t1,t2;
 
-
---echo #
---echo # Bug #20837 Apparent change of isolation 
---echo #     level during transaction
---echo #
-
-SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
-CREATE TABLE t1 (s1 INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1),(2);
-COMMIT;
-
-SET @@autocommit = 0;
-COMMIT;
-SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-START TRANSACTION;
-SELECT * FROM t1;
---echo Should be READ UNCOMMITTED
-SELECT @@tx_isolation;
-INSERT INTO t1 VALUES (-1);
---echo Should be READ UNCOMMITTED
-SELECT @@tx_isolation;
-COMMIT;
---echo Should now be REPEATABLE READ
-SELECT @@tx_isolation;
-DROP TABLE t1;
-
 --echo End of 5.1 tests

sql/handler.cc

@@ -1370,14 +1370,8 @@ int ha_autocommit_or_rollback(THD *thd, int error)
       if (thd->transaction_rollback_request && !thd->in_sub_stmt)
         (void) ha_rollback(thd);
     }
-  } 
-  else if (!(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))
-  {
-    /* 
-       If we're in autocommit mode, reset tx_isolation
-       to the default value
-    */
-    thd->variables.tx_isolation= thd->session_tx_isolation;
+
+    thd->variables.tx_isolation=thd->session_tx_isolation;
   }
 #endif
   DBUG_RETURN(error);