bk commit into 5.2 tree (istruewing:1.2518)

[ingo]

Below is the list of changes that have just been committed into a local
5.2 repository of istruewing. When istruewing does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-30 09:40:43+02:00, istruewing@stripped +5 -0
  post-merge fixes

  mysql-test/include/locktrans.inc@stripped, 2007-05-30 09:40:39+02:00, istruewing@stripped +4 -1
    post-merge fixes
    Some platforms do not remove table files quickly enough if
    another thread used the table before.

  mysql-test/r/locktrans_innodb.result@stripped, 2007-05-30 09:40:39+02:00, istruewing@stripped +1 -1
    post-merge fixes
    Fixed results.

  mysql-test/r/locktrans_myisam.result@stripped, 2007-05-30 09:40:39+02:00, istruewing@stripped +1 -1
    post-merge fixes
    Fixed results.

  mysql-test/r/rpl_locktrans_innodb.result@stripped, 2007-05-30 09:40:39+02:00, istruewing@stripped +1 -1
    post-merge fixes
    Fixed results.

  mysql-test/r/rpl_locktrans_myisam.result@stripped, 2007-05-30 09:40:39+02:00, istruewing@stripped +1 -1
    post-merge fixes
    Fixed results.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.2-axmrg

--- 1.3/mysql-test/include/locktrans.inc	2007-05-30 09:40:51 +02:00
+++ 1.4/mysql-test/include/locktrans.inc	2007-05-30 09:40:51 +02:00
@@ -293,12 +293,16 @@ DROP USER mysqltest_1@localhost;
 DROP DATABASE mysqltest;
 DROP TABLE t1, t2, t3, t4;
 #
+# Overcome timing problems DROP t1 -> CREATE t1 (*locktrans_myisam).
+--sleep 0.1
+#
 --echo #
 --echo # WL3594 - transactional LOCK TABLE Testing - Functional tests
 --echo # ============================================================
 #
 --echo # Prepare tables and connections.
 --echo # Set AUTOCOMMIT= 0 in each connection.
+SET AUTOCOMMIT= 0;
 eval CREATE TABLE t1 (c1 INT) ENGINE=$engine_type;
 eval CREATE TABLE t2 (c2 INT) ENGINE=$engine_type;
 connect (conn1,localhost,root,,);
@@ -311,7 +315,6 @@ connect (conn2,localhost,root,,);
         SET AUTOCOMMIT= 0;
 --echo # connection default.
 connection default;
-SET AUTOCOMMIT= 0;
 #
 
 if ($transactional)

--- 1.3/mysql-test/r/locktrans_innodb.result	2007-05-30 09:40:51 +02:00
+++ 1.4/mysql-test/r/locktrans_innodb.result	2007-05-30 09:40:51 +02:00
@@ -287,6 +287,7 @@ DROP TABLE t1, t2, t3, t4;
 # ============================================================
 # Prepare tables and connections.
 # Set AUTOCOMMIT= 0 in each connection.
+SET AUTOCOMMIT= 0;
 CREATE TABLE t1 (c1 INT) ENGINE=InnoDB;
 CREATE TABLE t2 (c2 INT) ENGINE=InnoDB;
 # connection conn1.
@@ -294,7 +295,6 @@ SET AUTOCOMMIT= 0;
 # connection conn2.
 SET AUTOCOMMIT= 0;
 # connection default.
-SET AUTOCOMMIT= 0;
 #
 # Transactional lock behaviour:
 # LOCK TABLE does _not_ commit a transaction.

--- 1.2/mysql-test/r/locktrans_myisam.result	2007-05-30 09:40:51 +02:00
+++ 1.3/mysql-test/r/locktrans_myisam.result	2007-05-30 09:40:51 +02:00
@@ -291,6 +291,7 @@ DROP TABLE t1, t2, t3, t4;
 # ============================================================
 # Prepare tables and connections.
 # Set AUTOCOMMIT= 0 in each connection.
+SET AUTOCOMMIT= 0;
 CREATE TABLE t1 (c1 INT) ENGINE=MyISAM;
 CREATE TABLE t2 (c2 INT) ENGINE=MyISAM;
 # connection conn1.
@@ -298,7 +299,6 @@ SET AUTOCOMMIT= 0;
 # connection conn2.
 SET AUTOCOMMIT= 0;
 # connection default.
-SET AUTOCOMMIT= 0;
 #
 # Normal WRITE locks go before readers (autocommit).
 # Set AUTOCOMMIT= 1.

--- 1.2/mysql-test/r/rpl_locktrans_innodb.result	2007-05-30 09:40:51 +02:00
+++ 1.3/mysql-test/r/rpl_locktrans_innodb.result	2007-05-30 09:40:51 +02:00
@@ -293,6 +293,7 @@ DROP TABLE t1, t2, t3, t4;
 # ============================================================
 # Prepare tables and connections.
 # Set AUTOCOMMIT= 0 in each connection.
+SET AUTOCOMMIT= 0;
 CREATE TABLE t1 (c1 INT) ENGINE=InnoDB;
 CREATE TABLE t2 (c2 INT) ENGINE=InnoDB;
 # connection conn1.
@@ -300,7 +301,6 @@ SET AUTOCOMMIT= 0;
 # connection conn2.
 SET AUTOCOMMIT= 0;
 # connection default.
-SET AUTOCOMMIT= 0;
 #
 # Transactional lock behaviour:
 # LOCK TABLE does _not_ commit a transaction.

--- 1.2/mysql-test/r/rpl_locktrans_myisam.result	2007-05-30 09:40:51 +02:00
+++ 1.3/mysql-test/r/rpl_locktrans_myisam.result	2007-05-30 09:40:51 +02:00
@@ -297,6 +297,7 @@ DROP TABLE t1, t2, t3, t4;
 # ============================================================
 # Prepare tables and connections.
 # Set AUTOCOMMIT= 0 in each connection.
+SET AUTOCOMMIT= 0;
 CREATE TABLE t1 (c1 INT) ENGINE=MyISAM;
 CREATE TABLE t2 (c2 INT) ENGINE=MyISAM;
 # connection conn1.
@@ -304,7 +305,6 @@ SET AUTOCOMMIT= 0;
 # connection conn2.
 SET AUTOCOMMIT= 0;
 # connection default.
-SET AUTOCOMMIT= 0;
 #
 # Normal WRITE locks go before readers (autocommit).
 # Set AUTOCOMMIT= 1.