From: Joerg Bruehe
Date: August 27 2009 8:47am
Subject: bzr push into mysql-5.4 branch (joerg:2874 to 2875)
List-Archive: http://lists.mysql.com/commits/81677
Message-Id: <20090827084759.57B8B7AD30@trift2.fambruehe>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_u+vmHRRhIMukyQZ7FXaTtQ)"

--Boundary_(ID_u+vmHRRhIMukyQZ7FXaTtQ)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

 2875 Joerg Bruehe	2009-08-27 [merge]
      Automerge "trunk" (5.4.2 cloning + version number increase to 5.4.3)
      into "trunk-build".

    modified:
      configure.in
      storage/innobase/handler/handler0alter.cc
 2874 Joerg Bruehe	2009-08-24 [merge]
      Automerge "trunk" -> "trunk-build".

    modified:
      storage/innobase/lock/lock0lock.c
=== modified file 'configure.in'
--- a/configure.in	2009-08-12 13:44:34 +0000
+++ b/configure.in	2009-08-26 09:59:49 +0000
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
 #
 # When changing major version number please also check switch statement
 # in client/mysqlbinlog.cc:check_master_version().
-AM_INIT_AUTOMAKE(mysql, 5.4.2-beta)
+AM_INIT_AUTOMAKE(mysql, 5.4.3-beta)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10

=== modified file 'storage/innobase/handler/handler0alter.cc'
--- a/storage/innobase/handler/handler0alter.cc	2009-07-30 12:42:56 +0000
+++ b/storage/innobase/handler/handler0alter.cc	2009-08-25 15:12:44 +0000
@@ -863,6 +863,7 @@ error_handling:
 		indexed_table->n_mysql_handles_opened++;
 
 		error = row_merge_drop_table(trx, innodb_table);
+		innodb_table = indexed_table;
 		goto convert_error;
 
 	case DB_TOO_BIG_RECORD:


--Boundary_(ID_u+vmHRRhIMukyQZ7FXaTtQ)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/joerg@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/joerg@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: joerg@stripped
# target_branch: file:///MySQL/REPO/V54/push-5.4/
# testament_sha1: 9dd3e69b1f2be03ea9a021214d0ef08cad3b6d1a
# timestamp: 2009-08-27 10:47:59 +0200
# source_branch: file:///MySQL/REPO/V54/mysql-5.4/
# base_revision_id: joerg@stripped
# 
# Begin bundle
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
ABkuCDsRrvWYahQG29SD/4u5IpwoSEPkTAgA


--Boundary_(ID_u+vmHRRhIMukyQZ7FXaTtQ)--