bzr push into mysql-next-mr-merge branch (tor.didriksen:3217 to 3218) Bug#34750

[Tor Didriksen]

 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);


Attachment: [text/bzr-bundle] bzr/[e-mail]