From: Tor Didriksen Date: October 5 2010 1:45pm Subject: bzr push into mysql-next-mr-merge branch (tor.didriksen:3217 to 3218) Bug#34750 List-Archive: http://lists.mysql.com/commits/120000 X-Bug: 34750 Message-Id: <20101005134535.83F55379F@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9169902643777620454==" --===============9169902643777620454== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 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 3217 Tor Didriksen 2010-10-05 [merge] Automerge trunk-merge => next-mr-merge up to last known good version, Text conflict in sql/sql_base.h Text conflict in sql/sql_select.cc modified: config.h.cmake configure.cmake configure.in dbug/dbug.c include/my_pthread.h include/mysql/psi/mysql_thread.h mysql-test/collections/default.experimental mysql-test/include/handler.inc mysql-test/include/mysqld--help.inc mysql-test/r/check.result mysql-test/r/delayed.result mysql-test/r/flush.result mysql-test/r/func_misc.result mysql-test/r/gis.result mysql-test/r/handler_innodb.result mysql-test/r/handler_myisam.result mysql-test/r/join.result mysql-test/r/log_tables_upgrade.result mysql-test/r/lowercase_fs_off.result mysql-test/r/mdl_sync.result mysql-test/r/merge.result mysql-test/r/myisampack.result mysql-test/r/mysql_upgrade.result mysql-test/r/mysql_upgrade_ssl.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/ps_2myisam.result mysql-test/r/ps_3innodb.result mysql-test/r/ps_4heap.result mysql-test/r/ps_5merge.result mysql-test/r/timezone2.result mysql-test/r/user_var.result mysql-test/r/variables_debug.result mysql-test/r/xa.result mysql-test/suite/innodb/r/innodb-autoinc.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/innodb/t/innodb-autoinc.test mysql-test/suite/innodb/t/innodb_mysql.test mysql-test/suite/parts/r/partition_special_innodb.result mysql-test/suite/perfschema/r/dml_setup_instruments.result mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/rpl_drop.test mysql-test/t/check.test mysql-test/t/delayed.test mysql-test/t/flush.test mysql-test/t/func_gconcat.test mysql-test/t/func_misc.test mysql-test/t/gis.test mysql-test/t/join.test mysql-test/t/lowercase_fs_off.test mysql-test/t/mdl_sync.test mysql-test/t/merge.test mysql-test/t/timezone2.test mysql-test/t/user_var.test mysql-test/t/variables_debug.test mysql-test/t/xa.test mysys/thr_rwlock.c sql/events.cc sql/events.h sql/field.cc sql/item_func.cc sql/item_func.h sql/item_geofunc.h sql/mdl.cc sql/mdl.h sql/sql_acl.cc sql/sql_admin.cc sql/sql_alter.cc sql/sql_base.cc sql/sql_base.h sql/sql_insert.cc sql/sql_lex.h sql/sql_parse.cc sql/sql_parse.h sql/sql_reload.cc sql/sql_rename.cc sql/sql_select.cc sql/sql_select.h sql/sql_string.h sql/sql_table.cc sql/sql_trigger.cc sql/sql_trigger.h sql/sql_truncate.cc sql/sql_yacc.yy sql/table.cc sql/table.h sql/transaction.cc sql/tztime.cc storage/innobase/btr/btr0cur.c storage/innobase/handler/ha_innodb.cc storage/innobase/include/btr0cur.h storage/innobase/include/dict0dict.h storage/innobase/include/dict0dict.ic storage/innobase/row/row0mysql.c storage/innobase/row/row0upd.c storage/myisammrg/ha_myisammrg.cc === 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); --===============9169902643777620454== 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:35 +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== --===============9169902643777620454==--