From: Tor Didriksen
Date: October 5 2010 1:45pm
Subject: bzr commit into mysql-next-mr-merge branch (tor.didriksen:3218) Bug#34750
List-Archive: http://lists.mysql.com/commits/119999
X-Bug: 34750
Message-Id: <20101005134512.DDB2D379F@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4086797030630320436=="

--===============4086797030630320436==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/didrik/repo/next-mr-merge/ based on revid:tor.didriksen@stripped

 3218 Tor Didriksen	2010-10-05
      BUG#34750 Print database name in Unknown Table error message, followup patch
     @ mysql-test/suite/innodb/r/innodb-autoinc.result
        BUG#34750 Print database name in Unknown Table error message

    modified:
      mysql-test/suite/innodb/r/innodb-autoinc.result
=== modified file 'mysql-test/suite/innodb/r/innodb-autoinc.result'
--- a/mysql-test/suite/innodb/r/innodb-autoinc.result	2010-10-05 09:15:51 +0000
+++ b/mysql-test/suite/innodb/r/innodb-autoinc.result	2010-10-05 13:45:08 +0000
@@ -1246,7 +1246,7 @@ t1	CREATE TABLE `t1` (
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1(c1 BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (NULL);
 INSERT INTO t1 VALUES (18446744073709551615);


--===============4086797030630320436==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   9v4d1m2emfqbb99u
# target_branch: file:///export/home/didrik/repo/next-mr-merge/
# testament_sha1: c1e0b13b9fa198dc972acfa74c244baf40543143
# timestamp: 2010-10-05 15:45:12 +0200
# source_branch: file:///export/home/didrik/repo/trunk-merge-br1/
# base_revision_id: tor.didriksen@stripped\
#   0tpkxcq0h2xc5foc
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW7C2eYAAb9fgEAwWuf/91eB
RgC/7//wUAPteTbjNW3dqVUGSENAk9MmGo0ynqbUBpo9IaD1NAMqbUNqaepkT1T1HpNNNNAAADIA
EkRMRqaNFN6h5EyR5E0ADIaNMhzAATAAEwAAAAAEkkam0ATTIaaap5NTyRtT9UABptJ6m8TWWxp7
ZjOqqGEKnYuUAcXOXttYvbG2nylREHv6mZj9KmZ26yXjAcJFy3+Hn3xKDGl28WLWK3GOjJu5OyPm
OR+zAeBoxFun4LAJ8wRdGXFoKiEOqSJqr3rMwNS5EiRIyRC/TG+h9E8evTAWwcOYR4DCGEUJy8Kq
wiYTlbfKlNGPiDzgEFe92a9AYJKhWuB2UGgEZKG9wwxRT5aYFMSpIgd1E5vFg3SWAehZlBfRYFoX
DZTQD2xa1ICFinR4cdjpS8/UGMmukM7AMgCzsB7USwamFNLC+pwXDpWy8ZS4tDIZzW3WMdplziZU
IEvF5do1SjhiTPAm1rsKglLWOEookWAwpScKS2sDLPgZiwwKihjiMAFx33hZPCbqKVanKUjEjA4X
pO7VaabXuFQYrRCKB3NdWhhfYI4CD0QGko5t46xdGYqsYOGqAjVKMxEdDKGNJCW5UFLRuTDqgYNo
aPtiL1CuvhU1bHfYowaOrS0yA40pOovNnKBOjURuOno04VZ+5vXx3bVYkaVOrMw2Z4XxsQfwlEJZ
jjrIWTODPnGexyva5d3r0NufRI5l1O+oHh0sU8Qb+6qOw3HAgPxRlFdCYTGJhQVpyFHWuNli3B1B
aiZaE/uHNciVOwRWs18220YMp3MkdUiykLtOhpgqM0LSnUpSwVLQeUSIGc41wcbyRoCkF9eb9iG4
2EIAotl78nMSUWtzfjWO0q9SQcqV7DOdu/bCuDUtvehTXyViDWAcRwKFeFeiuDAXVm54B8hIiBpW
Ypllp4mfPWsTE4VHno3tqsJwcoqxNuC1g3l9YXRc4TdaFEztL+XmH9ySITckCxRA1rsR3hop5Izb
6kx2w1QuDkHPdF79prDYsgWIZhiEAg5dqvJQKpDLhhlhcyGcR7hfR+dTWe4vKmoWNJ2E8085+g40
1BIa1RRQGCEnKfhOg6EG9OWoZky4ijQVcURXgnh1efZjQkfxIYJFk5f6ydbcNl9zMmZyWNoXTlrD
G8XUHNcruWiCRysWMElvCaPuinhaQOXiC7kyvjv3EieDJ9oOpMgVJe02QNBX/sLREg5nQ+ddo5en
8HMY2WWDnNJ9eqyenBejWkcCGqkyQwWGIzvKsLFmDQZafFGttHBkdGrRGKRbAsD7hiEQULryCWof
9P+LuSKcKEg3YWzzAA==


--===============4086797030630320436==--