List:Commits« Previous MessageNext Message »
From:Tatiana A. Nurnberg Date:February 24 2009 7:26am
Subject:bzr push into mysql-6.0-bugteam branch (azundris:3069)
View as plain text  
 3069 Tatiana A. Nurnberg	2009-02-24 [merge]
      automerge

    added:
      mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
      mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
    modified:
      mysql-test/r/mysqlbinlog.result
      mysql-test/suite/rpl/r/rpl_heartbeat.result
      mysql-test/suite/rpl/t/rpl_heartbeat.test
      mysql-test/t/mysqlbinlog.test
      sql/log_event.cc
      sql/sql_base.cc
      storage/myisam/ha_myisam.cc
      3066.1.12 Alexey Kopytov	2009-02-23 [merge]
                Manual merge 

        added:
          mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
          mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
        modified:
          mysql-test/r/mysqlbinlog.result
          mysql-test/t/mysqlbinlog.test
          sql/log_event.cc
          sql/sql_base.cc
          storage/myisam/ha_myisam.cc
        2497.763.16 Alexey Kopytov	2009-02-23 [merge]
                    Manual merge mysql-5.0-bugteam -> mysql-5.1-bugteam.

            modified:
              mysql-test/r/mysqlbinlog.result
              mysql-test/t/mysqlbinlog.test
              sql/log_event.cc
            1810.3854.4 Alexey Kopytov	2009-02-23 [merge]
                        Automerge.

                modified:
                  configure.in
                  include/config-win.h
                  include/my_global.h
                  mysql-test/r/func_math.result
                  mysql-test/t/func_math.test
                  sql/mysqld.cc
            1810.3854.3 Patrick Crews	2009-02-20 [merge]
                        automerge

                added:
                  mysql-test/include/wait_show_condition.inc
                  mysql-test/r/innodb_bug42419.result
                  mysql-test/t/innodb_bug42419.test
                modified:
                  mysql-test/r/mysqlbinlog.result
                  mysql-test/r/row.result
                  mysql-test/t/mysqlbinlog.test
                  mysql-test/t/row.test
                  sql/item.cc
                  sql/item.h
                  sql/item_cmpfunc.cc
                  sql/log_event.cc
                  sql/sql_select.cc
                  tests/mysql_client_test.c
            1810.3853.4 Andrei Elkin	2009-02-20
                        Bug #37313 BINLOG Contains Incorrect server id
                          
                        Signed integer format specifier forced to print the binlog header with server_id
                        negative if the unsigned value sets the sign-bit ON.
                          
                        Fixed with correcting the specifier to correspond to typeof(server_id) == ulong.
                 @ mysql-test/r/mysqlbinlog.result
                    results changed.
                 @ mysql-test/t/mysqlbinlog.test
                    displaying the expected unsignedly formatted server_id value, bug#37313.
                 @ sql/log_event.cc
                    Format specifier is corrected to correspond to typeof(server_id).

                modified:
                  mysql-test/r/mysqlbinlog.result
                  mysql-test/t/mysqlbinlog.test
                  sql/log_event.cc
        2497.763.15 Alexey Kopytov	2009-02-23 [merge]
                    Automerge.

            modified:
              configure.in
              include/config-win.h
              include/my_global.h
              mysql-test/r/func_math.result
              mysql-test/t/func_math.test
              sql/mysqld.cc
             2497.790.7 Alexey Kopytov	2009-02-23 [merge]
                        Manual merge to 5.1.

                modified:
                  configure.in
                  include/config-win.h
                  include/my_global.h
                  mysql-test/r/func_math.result
                  mysql-test/t/func_math.test
                  sql/mysqld.cc
            1810.3855.1 Alexey Kopytov	2009-02-23
                        Fix for bug #15936: "round" differs on Windows to Unix
                        
                        Both of our own implementations of rint(3) were inconsistent with the
                        most common behavior of rint() on those platforms that have it: round
                        to nearest, break ties by rounding to nearest even.
                        
                        Fixed by leaving just one implementation of rint() in our source tree,
                        and changing its behavior to match the most common native
                        implementations on other platforms.
                 @ configure.in
                    Added checks for fenv.h and fesetround().
                 @ include/config-win.h
                    Removed the incorrect implementation of rint() for Windows.
                 @ include/my_global.h
                    Added an rint() implementation for platforms that do not have it.
                 @ mysql-test/r/func_math.result
                    Added a test case for bug #15936.
                 @ mysql-test/t/func_math.test
                    Added a test case for bug #15936.
                 @ sql/mysqld.cc
                    Explicitly set the FPU rounding mode with fesetround().

                modified:
                  configure.in
                  include/config-win.h
                  include/my_global.h
                  mysql-test/r/func_math.result
                  mysql-test/t/func_math.test
                  sql/mysqld.cc
        2497.763.14 Anurag Shekhar	2009-02-23 [merge]
                    merging with changes in bugteam branch.

            added:
              mysql-test/include/wait_show_condition.inc
              mysql-test/r/innodb_bug42419.result
              mysql-test/r/lowercase_utf8.result
              mysql-test/suite/rpl/r/rpl_slave_load_in.result
              mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
              mysql-test/suite/rpl/t/rpl_slave_load_in.test
              mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
              mysql-test/t/innodb_bug42419.test
              mysql-test/t/lowercase_utf8-master.opt
              mysql-test/t/lowercase_utf8.test
            modified:
              client/mysql.cc
              configure.in
              mysql-test/include/ndb_backup.inc
              mysql-test/lib/My/CoreDump.pm
              mysql-test/r/backup.result
              mysql-test/r/mysqlbinlog.result
              mysql-test/r/mysqltest.result
              mysql-test/r/partition.result
              mysql-test/r/partition_error.result
              mysql-test/r/partition_mgm_err.result
              mysql-test/r/query_cache_debug.result
              mysql-test/r/row.result
              mysql-test/r/show_check.result
              mysql-test/r/sp-error.result
              mysql-test/r/sp.result
              mysql-test/r/sp_trans.result
              mysql-test/r/trigger-compat.result
              mysql-test/r/type_blob.result
              mysql-test/r/type_timestamp.result
              mysql-test/r/warnings.result
              mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
              mysql-test/suite/funcs_1/r/innodb_trig_0102.result
              mysql-test/suite/funcs_1/r/innodb_trig_0407.result
              mysql-test/suite/funcs_1/r/memory_storedproc_08.result
              mysql-test/suite/funcs_1/r/memory_trig_0102.result
              mysql-test/suite/funcs_1/r/memory_trig_0407.result
              mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
              mysql-test/suite/funcs_1/r/myisam_trig_0102.result
              mysql-test/suite/funcs_1/r/myisam_trig_0407.result
              mysql-test/suite/funcs_1/r/ndb_storedproc_08.result
              mysql-test/suite/funcs_1/r/ndb_trig_0102.result
              mysql-test/suite/funcs_1/r/ndb_trig_0407.result
              mysql-test/suite/funcs_1/r/storedproc.result
              mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
              mysql-test/suite/funcs_1/t/storedproc.test
              mysql-test/suite/funcs_1/triggers/triggers_0102.inc
              mysql-test/suite/funcs_1/triggers/triggers_0407.inc
              mysql-test/suite/ndb_team/t/ndb_autodiscover.test
              mysql-test/suite/parts/inc/partition_auto_increment.inc
              mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result
              mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
              mysql-test/suite/parts/r/partition_alter1_1_innodb.result
              mysql-test/suite/parts/r/partition_alter1_1_myisam.result
              mysql-test/suite/parts/r/partition_alter2_1_innodb.result
              mysql-test/suite/parts/r/partition_alter2_1_myisam.result
              mysql-test/suite/parts/r/partition_alter2_2_innodb.result
              mysql-test/suite/parts/r/partition_alter2_2_myisam.result
              mysql-test/suite/parts/r/partition_auto_increment_blackhole.result
              mysql-test/suite/parts/r/partition_auto_increment_ndb.result
              mysql-test/suite/parts/r/partition_basic_innodb.result
              mysql-test/suite/parts/r/partition_basic_myisam.result
              mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
              mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
              mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result
              mysql-test/suite/parts/r/partition_mgm_lc0_memory.result
              mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result
              mysql-test/suite/parts/r/partition_mgm_lc0_ndb.result
              mysql-test/suite/parts/r/partition_mgm_lc1_archive.result
              mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result
              mysql-test/suite/parts/r/partition_mgm_lc1_memory.result
              mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result
              mysql-test/suite/parts/r/partition_mgm_lc1_ndb.result
              mysql-test/suite/parts/r/partition_mgm_lc2_archive.result
              mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
              mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
              mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
              mysql-test/suite/parts/r/partition_mgm_lc2_ndb.result
              mysql-test/suite/rpl/r/rpl_row_until.result
              mysql-test/suite/rpl/r/rpl_sp.result
              mysql-test/suite/rpl/t/rpl_cross_version.test
              mysql-test/suite/rpl/t/rpl_row_until.test
              mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result
              mysql-test/t/disabled.def
              mysql-test/t/innodb_mysql.test
              mysql-test/t/mysqlbinlog.test
              mysql-test/t/mysqltest.test
              mysql-test/t/partition.test
              mysql-test/t/partition_error.test
              mysql-test/t/query_cache_28249.test
              mysql-test/t/query_cache_debug.test
              mysql-test/t/row.test
              mysql-test/t/trigger-compat.test
              sql/ha_partition.cc
              sql/handler.cc
              sql/item.cc
              sql/item.h
              sql/item_cmpfunc.cc
              sql/log_event.cc
              sql/log_event.h
              sql/mysqld.cc
              sql/rpl_rli.cc
              sql/rpl_rli.h
              sql/set_var.cc
              sql/share/errmsg.txt
              sql/sql_base.cc
              sql/sql_cache.cc
              sql/sql_insert.cc
              sql/sql_load.cc
              sql/sql_parse.cc
              sql/sql_select.cc
              sql/sql_show.cc
              sql/sql_table.cc
              sql/sql_yacc.yy
              storage/myisam/ha_myisam.cc
              storage/myisam/mi_locking.c
              storage/myisam/myisamdef.h
              tests/mysql_client_test.c
             2497.791.3 Leonard Zhou	2009-02-23 [merge]
                        merge

                modified:
                  mysql-test/t/query_cache_28249.test
             2497.791.2 Leonard Zhou	2009-02-23 [merge]
                        merge

                removed:
                  cmd-line-utils/libedit/TEST/
                  cmd-line-utils/libedit/TEST/test.c
                  cmd-line-utils/libedit/compat.h
                  cmd-line-utils/libedit/compat_conf.h
                  cmd-line-utils/libedit/editline.3
                  cmd-line-utils/libedit/editrc.5
                  cmd-line-utils/libedit/fgetln.c
                  cmd-line-utils/libedit/fgetln.h
                  cmd-line-utils/libedit/libedit_term.h
                  cmd-line-utils/libedit/strlcpy.c
                  cmd-line-utils/libedit/strlcpy.h
                  cmd-line-utils/libedit/tokenizer.h
                  cmd-line-utils/libedit/unvis.c
                  cmd-line-utils/libedit/vis.c
                  cmd-line-utils/libedit/vis.h
                  mysql-test/include/wait_for_query_to_suceed.inc
                added:
                  cmd-line-utils/libedit/README
                  cmd-line-utils/libedit/filecomplete.c
                  cmd-line-utils/libedit/filecomplete.h
                  mysql-test/extra/binlog_tests/binlog_truncate.test
                  mysql-test/include/wait_for_query_to_succeed.inc
                  mysql-test/include/wait_show_condition.inc
                  mysql-test/r/innodb_bug42419.result
                  mysql-test/r/innodb_ignore_builtin.result
                  mysql-test/r/lowercase_utf8.result
                  mysql-test/suite/binlog/r/binlog_truncate_innodb.result
                  mysql-test/suite/binlog/r/binlog_truncate_myisam.result
                  mysql-test/suite/binlog/t/binlog_truncate_innodb-master.opt
                  mysql-test/suite/binlog/t/binlog_truncate_innodb.test
                  mysql-test/suite/binlog/t/binlog_truncate_myisam.test
                  mysql-test/suite/rpl/r/rpl_drop_if_exists.result
                  mysql-test/suite/rpl/r/rpl_slave_load_in.result
                  mysql-test/suite/rpl/t/rpl_drop_if_exists.test
                  mysql-test/suite/rpl/t/rpl_slave_load_in.test
                  mysql-test/t/innodb_bug42419.test
                  mysql-test/t/innodb_ignore_builtin-master.opt
                  mysql-test/t/innodb_ignore_builtin.test
                  mysql-test/t/lowercase_utf8-master.opt
                  mysql-test/t/lowercase_utf8.test
                modified:
                  client/mysql.cc
                  client/mysqltest.cc
                  client/sql_string.cc
                  cmd-line-utils/libedit/Makefile.am
                  cmd-line-utils/libedit/chared.c
                  cmd-line-utils/libedit/chared.h
                  cmd-line-utils/libedit/common.c
                  cmd-line-utils/libedit/config.h
                  cmd-line-utils/libedit/el.c
                  cmd-line-utils/libedit/el.h
                  cmd-line-utils/libedit/el_term.h
                  cmd-line-utils/libedit/emacs.c
                  cmd-line-utils/libedit/hist.c
                  cmd-line-utils/libedit/histedit.h
                  cmd-line-utils/libedit/history.c
                  cmd-line-utils/libedit/key.c
                  cmd-line-utils/libedit/key.h
                  cmd-line-utils/libedit/makelist.sh
                  cmd-line-utils/libedit/map.c
                  cmd-line-utils/libedit/np/fgetln.c
                  cmd-line-utils/libedit/np/strlcat.c
                  cmd-line-utils/libedit/np/strlcpy.c
                  cmd-line-utils/libedit/np/unvis.c
                  cmd-line-utils/libedit/np/vis.c
                  cmd-line-utils/libedit/np/vis.h
                  cmd-line-utils/libedit/parse.c
                  cmd-line-utils/libedit/parse.h
                  cmd-line-utils/libedit/prompt.c
                  cmd-line-utils/libedit/read.c
                  cmd-line-utils/libedit/read.h
                  cmd-line-utils/libedit/readline.c
                  cmd-line-utils/libedit/readline/readline.h
                  cmd-line-utils/libedit/refresh.c
                  cmd-line-utils/libedit/search.c
                  cmd-line-utils/libedit/sig.c
                  cmd-line-utils/libedit/sig.h
                  cmd-line-utils/libedit/sys.h
                  cmd-line-utils/libedit/term.c
                  cmd-line-utils/libedit/tokenizer.c
                  cmd-line-utils/libedit/tty.c
                  cmd-line-utils/libedit/tty.h
                  cmd-line-utils/libedit/vi.c
                  configure.in
                  include/my_global.h
                  libmysql/libmysql.c
                  mysql-test/extra/rpl_tests/rpl_truncate.test
                  mysql-test/extra/rpl_tests/rpl_truncate_helper.test
                  mysql-test/include/ndb_backup.inc
                  mysql-test/include/setup_fake_relay_log.inc
                  mysql-test/include/wait_until_count_sessions.inc
                  mysql-test/lib/My/CoreDump.pm
                  mysql-test/lib/My/SafeProcess/safe_process_win.cc
                  mysql-test/lib/mtr_unique.pm
                  mysql-test/mysql-test-run.pl
                  mysql-test/r/archive_gis.result
                  mysql-test/r/backup.result
                  mysql-test/r/commit_1innodb.result
                  mysql-test/r/fulltext.result
                  mysql-test/r/func_group.result
                  mysql-test/r/func_math.result
                  mysql-test/r/func_str.result
                  mysql-test/r/gis.result
                  mysql-test/r/grant.result
                  mysql-test/r/information_schema.result
                  mysql-test/r/innodb_gis.result
                  mysql-test/r/lowercase_table3.result
                  mysql-test/r/merge.result
                  mysql-test/r/multi_update.result
                  mysql-test/r/mysqlbinlog.result
                  mysql-test/r/mysqlbinlog_row_trans.result
                  mysql-test/r/mysqltest.result
                  mysql-test/r/packet.result
                  mysql-test/r/parser.result
                  mysql-test/r/partition.result
                  mysql-test/r/partition_error.result
                  mysql-test/r/partition_mgm_err.result
                  mysql-test/r/query_cache_debug.result
                  mysql-test/r/query_cache_notembedded.result
                  mysql-test/r/read_only.result
                  mysql-test/r/row.result
                  mysql-test/r/select.result
                  mysql-test/r/show_check.result
                  mysql-test/r/sp-error.result
                  mysql-test/r/sp.result
                  mysql-test/r/sp_trans.result
                  mysql-test/r/subselect.result
                  mysql-test/r/synchronization.result
                  mysql-test/r/trigger-compat.result
                  mysql-test/r/type_blob.result
                  mysql-test/r/type_datetime.result
                  mysql-test/r/type_float.result
                  mysql-test/r/type_timestamp.result
                  mysql-test/r/warnings.result
                  mysql-test/r/windows.result
                  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
                  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
                  mysql-test/suite/binlog/r/binlog_unsafe.result
                  mysql-test/suite/binlog/t/binlog_unsafe.test
                  mysql-test/suite/binlog/t/disabled.def
                  mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
                  mysql-test/suite/funcs_1/r/innodb_trig_0102.result
                  mysql-test/suite/funcs_1/r/innodb_trig_0407.result
                  mysql-test/suite/funcs_1/r/memory_func_view.result
                  mysql-test/suite/funcs_1/r/memory_storedproc_08.result
                  mysql-test/suite/funcs_1/r/memory_trig_0102.result
                  mysql-test/suite/funcs_1/r/memory_trig_0407.result
                  mysql-test/suite/funcs_1/r/memory_views.result
                  mysql-test/suite/funcs_1/r/myisam_func_view.result
                  mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
                  mysql-test/suite/funcs_1/r/myisam_trig_0102.result
                  mysql-test/suite/funcs_1/r/myisam_trig_0407.result
                  mysql-test/suite/funcs_1/r/myisam_views.result
                  mysql-test/suite/funcs_1/r/ndb_func_view.result
                  mysql-test/suite/funcs_1/r/ndb_storedproc_08.result
                  mysql-test/suite/funcs_1/r/ndb_trig_0102.result
                  mysql-test/suite/funcs_1/r/ndb_trig_0407.result
                  mysql-test/suite/funcs_1/r/ndb_views.result
                  mysql-test/suite/funcs_1/r/storedproc.result
                  mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
                  mysql-test/suite/funcs_1/t/storedproc.test
                  mysql-test/suite/funcs_1/triggers/triggers_0102.inc
                  mysql-test/suite/funcs_1/triggers/triggers_0407.inc
                  mysql-test/suite/ndb/r/ndb_gis.result
                  mysql-test/suite/ndb_team/t/ndb_autodiscover.test
                  mysql-test/suite/parts/inc/partition_auto_increment.inc
                  mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result
                  mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
                  mysql-test/suite/parts/r/partition_alter1_1_innodb.result
                  mysql-test/suite/parts/r/partition_alter1_1_myisam.result
                  mysql-test/suite/parts/r/partition_alter2_1_innodb.result
                  mysql-test/suite/parts/r/partition_alter2_1_myisam.result
                  mysql-test/suite/parts/r/partition_alter2_2_innodb.result
                  mysql-test/suite/parts/r/partition_alter2_2_myisam.result
                  mysql-test/suite/parts/r/partition_auto_increment_blackhole.result
                  mysql-test/suite/parts/r/partition_auto_increment_ndb.result
                  mysql-test/suite/parts/r/partition_basic_innodb.result
                  mysql-test/suite/parts/r/partition_basic_myisam.result
                  mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
                  mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
                  mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result
                  mysql-test/suite/parts/r/partition_mgm_lc0_memory.result
                  mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result
                  mysql-test/suite/parts/r/partition_mgm_lc0_ndb.result
                  mysql-test/suite/parts/r/partition_mgm_lc1_archive.result
                  mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result
                  mysql-test/suite/parts/r/partition_mgm_lc1_memory.result
                  mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result
                  mysql-test/suite/parts/r/partition_mgm_lc1_ndb.result
                  mysql-test/suite/parts/r/partition_mgm_lc2_archive.result
                  mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
                  mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
                  mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
                  mysql-test/suite/parts/r/partition_mgm_lc2_ndb.result
                  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
                  mysql-test/suite/rpl/r/rpl_row_until.result
                  mysql-test/suite/rpl/r/rpl_sp.result
                  mysql-test/suite/rpl/r/rpl_truncate_2myisam.result
                  mysql-test/suite/rpl/r/rpl_truncate_3innodb.result
                  mysql-test/suite/rpl/t/rpl_cross_version.test
                  mysql-test/suite/rpl/t/rpl_row_until.test
                  mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result
                  mysql-test/t/backup.test
                  mysql-test/t/check.test
                  mysql-test/t/compress.test
                  mysql-test/t/disabled.def
                  mysql-test/t/fulltext.test
                  mysql-test/t/func_str.test
                  mysql-test/t/gis.test
                  mysql-test/t/grant.test
                  mysql-test/t/information_schema.test
                  mysql-test/t/innodb_mysql.test
                  mysql-test/t/lowercase_table3.test
                  mysql-test/t/merge.test
                  mysql-test/t/multi_update.test
                  mysql-test/t/mysqlbinlog.test
                  mysql-test/t/mysqltest.test
                  mysql-test/t/overflow.test
                  mysql-test/t/packet.test
                  mysql-test/t/partition.test
                  mysql-test/t/partition_error.test
                  mysql-test/t/query_cache_debug.test
                  mysql-test/t/query_cache_notembedded.test
                  mysql-test/t/read_only.test
                  mysql-test/t/rename.test
                  mysql-test/t/row.test
                  mysql-test/t/sp-threads.test
                  mysql-test/t/subselect.test
                  mysql-test/t/synchronization.test
                  mysql-test/t/timezone_grant.test
                  mysql-test/t/trigger-compat.test
                  mysql-test/t/type_datetime.test
                  mysql-test/t/type_float.test
                  mysql-test/t/windows.test
                  sql-bench/test-create.sh
                  sql-common/my_time.c
                  sql/ha_partition.cc
                  sql/handler.cc
                  sql/item.cc
                  sql/item.h
                  sql/item_cmpfunc.cc
                  sql/item_func.cc
                  sql/log_event.cc
                  sql/log_event.h
                  sql/mysql_priv.h
                  sql/mysqld.cc
                  sql/rpl_rli.cc
                  sql/rpl_rli.h
                  sql/set_var.cc
                  sql/share/errmsg.txt
                  sql/sql_base.cc
                  sql/sql_cache.cc
                  sql/sql_class.cc
                  sql/sql_delete.cc
                  sql/sql_insert.cc
                  sql/sql_load.cc
                  sql/sql_parse.cc
                  sql/sql_plugin.cc
                  sql/sql_select.cc
                  sql/sql_show.cc
                  sql/sql_string.cc
                  sql/sql_table.cc
                  sql/sql_yacc.yy
                  storage/myisam/ha_myisam.cc
                  storage/myisam/mi_locking.c
                  storage/myisam/myisamdef.h
                  storage/myisammrg/ha_myisammrg.cc
                  storage/myisammrg/ha_myisammrg.h
                  storage/myisammrg/myrg_open.c
                  support-files/my-huge.cnf.sh
                  support-files/my-large.cnf.sh
                  support-files/my-medium.cnf.sh
                  support-files/my-small.cnf.sh
                  tests/mysql_client_test.c
             2497.791.1 Leonard Zhou	2009-02-23
                        Bug#40013 mixed replication: row based format could lead to stale tmp tables on the
                        slave.
                        
                        In mixed mode, if we create a temporary table and do some update which switch to ROW format,
                        the format will keep in ROW format until the session ends or the table is dropped explicitly. 
                        When the session ends, the temp table is dropped automaticly at cleanup time.
                        but it checks only current binlog format and so skip insertion of DROP TABLE instructions into binlog.
                        So the temp table can't be dropped correctly at slave.
                        
                        Our solution is that when closing temp tables at cleanup time we check both binlog format and binlog mode,
                        and we could write DROP TABLE instructions into binlog if current binlog format is ROW but in MIX mode.
                 @ mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
                    Test result file.
                 @ mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
                    Test file.
                 @ sql/sql_base.cc
                    Didn't do binloging when both current format and default format are ROW.

                added:
                  mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
                  mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
                modified:
                  sql/sql_base.cc
        2497.763.13 Anurag Shekhar	2009-02-16 [merge]
                    Merging changes in branch.

            modified:
              client/mysqltest.cc
              client/sql_string.cc
              libmysql/libmysql.c
              mysql-test/include/setup_fake_relay_log.inc
              mysql-test/include/wait_until_count_sessions.inc
              mysql-test/mysql-test-run.pl
              mysql-test/r/archive_gis.result
              mysql-test/r/func_group.result
              mysql-test/r/func_math.result
              mysql-test/r/func_str.result
              mysql-test/r/gis.result
              mysql-test/r/grant.result
              mysql-test/r/information_schema.result
              mysql-test/r/innodb_gis.result
              mysql-test/r/lowercase_table3.result
              mysql-test/r/multi_update.result
              mysql-test/r/packet.result
              mysql-test/r/parser.result
              mysql-test/r/query_cache_notembedded.result
              mysql-test/r/select.result
              mysql-test/r/sp.result
              mysql-test/r/subselect.result
              mysql-test/r/synchronization.result
              mysql-test/r/type_datetime.result
              mysql-test/r/type_float.result
              mysql-test/suite/funcs_1/r/memory_func_view.result
              mysql-test/suite/funcs_1/r/memory_views.result
              mysql-test/suite/funcs_1/r/myisam_func_view.result
              mysql-test/suite/funcs_1/r/myisam_views.result
              mysql-test/suite/funcs_1/r/ndb_func_view.result
              mysql-test/suite/funcs_1/r/ndb_views.result
              mysql-test/suite/ndb/r/ndb_gis.result
              mysql-test/suite/rpl/t/rpl_cross_version.test
              mysql-test/t/backup.test
              mysql-test/t/check.test
              mysql-test/t/compress.test
              mysql-test/t/func_str.test
              mysql-test/t/gis.test
              mysql-test/t/grant.test
              mysql-test/t/information_schema.test
              mysql-test/t/lowercase_table3.test
              mysql-test/t/multi_update.test
              mysql-test/t/overflow.test
              mysql-test/t/packet.test
              mysql-test/t/query_cache_notembedded.test
              mysql-test/t/sp-threads.test
              mysql-test/t/subselect.test
              mysql-test/t/synchronization.test
              mysql-test/t/timezone_grant.test
              mysql-test/t/type_datetime.test
              mysql-test/t/type_float.test
              sql-bench/test-create.sh
              sql-common/my_time.c
              sql/handler.cc
              sql/mysql_priv.h
              sql/sql_class.cc
              sql/sql_string.cc
        2497.763.12 Anurag Shekhar	2009-02-13
                    Bug#40321 ha_myisam::info could update rec_per_key incorrectly
                          
                          MyISAM did copy of key statistics incorrectly, which may cause
                    server crash or incorrect cardinality values. This may happen only on
                    platforms where size of long differs from size of pointer.
                          
                          To determine number of bytes to be copied from array of ulong,
                    MyISAM mistakenly used sizoef(pointer) instead of sizeof(ulong).

            modified:
              storage/myisam/ha_myisam.cc
      3066.1.11 Alexey Kopytov	2009-02-23 [merge]
                Automerge.

           3066.2.1 Alexey Kopytov	2009-02-23
                    Null merge to 6.0.

      3066.1.10 Andrei Elkin	2009-02-23
                Increasing the slave net timeout and the idle counting hb timeout times 2 to prove correllation of the test failure with the value. TODO: restore the values back once that has been proved and the bug fixed

        modified:
          mysql-test/suite/rpl/r/rpl_heartbeat.result
          mysql-test/suite/rpl/t/rpl_heartbeat.test
       3066.1.9 Andrei Elkin	2009-02-23
                Bug #37714 rpl.rpl_heartbeat fails sporadically in pushbuild due to timeout
                
                Logs on PB show that the IO thread was down by the clean-up (drop table t1) of the test.
                A propable reason for IO thread to stop is a small value of slave_net_timeout - chosen as 
                tradeoff betweeen a need to test counting of heartbeats and the test execution time.
                On a slow env it can be that the timeout elapses first before any heartbeat got arrived.
                
                Fixed with performing the clean-up separately by the master and the slave.
         @ mysql-test/suite/rpl/r/rpl_heartbeat.result
            results changed
         @ mysql-test/suite/rpl/t/rpl_heartbeat.test
            synchronization at clean-up is removed. Instead, the slave and the master makes that
            separately. The reason is in values of timeouts that is difficult to tune a way to guarantee
            the slave IO is always connected by the cleanup time.

        modified:
          mysql-test/suite/rpl/r/rpl_heartbeat.result
          mysql-test/suite/rpl/t/rpl_heartbeat.test
=== modified file 'client/mysqldump.c'
--- a/client/mysqldump.c	2009-02-16 21:18:45 +0000
+++ b/client/mysqldump.c	2009-02-19 17:36:09 +0000
@@ -1522,7 +1522,8 @@ static int connect_to_db(char *host, cha
     DB_error(&mysql_connection, "when trying to connect");
     DBUG_RETURN(1);
   }
-  if (mysql_get_server_version(&mysql_connection) < 40100)
+  if ((mysql_get_server_version(&mysql_connection) < 40100) ||
+      (opt_compatible_mode & 3))
   {
     /* Don't dump SET NAMES with a pre-4.1 server (bug#7997).  */
     opt_set_charset= 0;
@@ -2471,11 +2472,11 @@ static uint get_table_structure(char *ta
 
       row= mysql_fetch_row(result);
 
-      fprintf(sql_file,
-              "SET @saved_cs_client     = @@character_set_client;\n"
-              "SET character_set_client = utf8;\n"
+      fprintf(sql_file, (opt_compatible_mode & 3) ? "%s;\n" :
+              "/*!40101 SET @saved_cs_client     = @@character_set_client */;\n"
+              "/*!40101 SET character_set_client = utf8 */;\n"
               "%s;\n"
-              "SET character_set_client = @saved_cs_client;\n",
+              "/*!40101 SET character_set_client = @saved_cs_client */;\n",
               row[1]);
 
       check_io(sql_file);

=== modified file 'mysql-test/r/ddl_i18n_koi8r.result'
--- a/mysql-test/r/ddl_i18n_koi8r.result	2009-02-16 14:47:53 +0000
+++ b/mysql-test/r/ddl_i18n_koi8r.result	2009-02-19 17:36:09 +0000
@@ -1729,18 +1729,18 @@ DELETE FROM mysqltest2.log|
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 */;
 
 USE `mysqltest1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `log` (
   `msg` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-SET character_set_client = @saved_cs_client;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `t1` VALUES (1),(0),(1);
 ALTER DATABASE mysqltest1 CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
@@ -1808,18 +1808,18 @@ ALTER DATABASE mysqltest1 CHARACTER SET
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 */;
 
 USE `mysqltest2`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `log` (
   `msg` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-SET character_set_client = @saved_cs_client;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `t1` VALUES (1),(0),(1);
 ALTER DATABASE mysqltest2 CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;

=== modified file 'mysql-test/r/ddl_i18n_utf8.result'
--- a/mysql-test/r/ddl_i18n_utf8.result	2009-02-16 14:47:53 +0000
+++ b/mysql-test/r/ddl_i18n_utf8.result	2009-02-19 17:36:09 +0000
@@ -1729,18 +1729,18 @@ DELETE FROM mysqltest2.log|
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 */;
 
 USE `mysqltest1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `log` (
   `msg` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-SET character_set_client = @saved_cs_client;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `t1` VALUES (1),(0),(1);
 ALTER DATABASE mysqltest1 CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
@@ -1808,18 +1808,18 @@ ALTER DATABASE mysqltest1 CHARACTER SET
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 */;
 
 USE `mysqltest2`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `log` (
   `msg` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-SET character_set_client = @saved_cs_client;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `t1` VALUES (1),(0),(1);
 ALTER DATABASE mysqltest2 CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;

=== modified file 'mysql-test/r/mysqldump-max.result'
--- a/mysql-test/r/mysqldump-max.result	2008-09-11 06:14:19 +0000
+++ b/mysql-test/r/mysqldump-max.result	2009-02-19 17:22:28 +0000
@@ -93,73 +93,73 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `id` int(8) DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t1` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t2`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t2` (
   `id` int(8) DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t2` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t3`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t3` (
   `id` int(8) DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t3` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t3` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t3` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t4`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t4` (
   `id` int(8) DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t4` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t4` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t4` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t5`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t5` (
   `id` int(8) DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t5` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t5` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t5` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t6`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t6` (
   `id` int(8) DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t6` DISABLE KEYS */;
 INSERT  IGNORE INTO `t6` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
@@ -190,73 +190,73 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `id` int(8) DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 INSERT  DELAYED INTO `t1` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t2`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t2` (
   `id` int(8) DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
 INSERT  DELAYED INTO `t2` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t3`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t3` (
   `id` int(8) DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t3` DISABLE KEYS */;
 INSERT  DELAYED INTO `t3` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t3` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t4`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t4` (
   `id` int(8) DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t4` DISABLE KEYS */;
 INSERT  DELAYED INTO `t4` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t4` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t5`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t5` (
   `id` int(8) DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t5` DISABLE KEYS */;
 INSERT  DELAYED INTO `t5` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t5` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t6`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t6` (
   `id` int(8) DEFAULT NULL,
   `name` varchar(32) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t6` DISABLE KEYS */;
 INSERT INTO `t6` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');

=== modified file 'mysql-test/r/mysqldump.result'
--- a/mysql-test/r/mysqldump.result	2009-02-03 16:32:37 +0000
+++ b/mysql-test/r/mysqldump.result	2009-02-19 17:36:09 +0000
@@ -34,12 +34,12 @@ DROP TABLE t1;
 CREATE TABLE t1 (a decimal(64, 20));
 INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
 ("0987654321098765432109876543210987654321");
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` decimal(64,20) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('987654321098765432109876543210987654321.00000000000000000000');
 DROP TABLE t1;
 #
@@ -49,12 +49,12 @@ CREATE TABLE t1 (a double);
 INSERT INTO t1 VALUES ('-9e999999');
 Warnings:
 Warning	1264	Out of range value for column 'a' at row 1
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` double DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `t1` VALUES (-1.7976931348623157e308);
 DROP TABLE t1;
 #
@@ -70,21 +70,21 @@ INSERT INTO t1 VALUES ('1.2345', 2.3456)
 INSERT INTO t1 VALUES ("1.2345", 2.3456);
 ERROR 42S22: Unknown column '1.2345' in 'field list'
 SET SQL_MODE=@OLD_SQL_MODE;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` decimal(10,5) DEFAULT NULL,
   `b` float DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` decimal(10,5) DEFAULT NULL,
   `b` float DEFAULT NULL
 );
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
@@ -98,13 +98,13 @@ INSERT INTO `t1` VALUES ('1.23450',2.345
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` decimal(10,5) DEFAULT NULL,
   `b` float DEFAULT NULL
 );
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -127,13 +127,13 @@ UNLOCK TABLES;
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` decimal(10,5) DEFAULT NULL,
   `b` float DEFAULT NULL
 );
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -209,12 +209,12 @@ INSERT INTO t1  VALUES (_koi8r x'C1C2C3C
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` varchar(255) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=koi8r;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -245,12 +245,9 @@ INSERT INTO t1 VALUES (1), (2);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL40' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) TYPE=MyISAM;
-SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -271,12 +268,9 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) TYPE=MyISAM;
-SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -295,12 +289,12 @@ DROP TABLE t1;
 # Bug#2592 mysqldump doesn't quote "tricky" names correctly
 #
 create table ```a` (i int);
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE ```a` (
   `i` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 drop table ```a`;
 #
 # Bug#2591 mysqldump quotes names inconsistently
@@ -318,12 +312,12 @@ create table t1(a int);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -346,12 +340,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS "t1";
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE "t1" (
   "a" int(11) DEFAULT NULL
 );
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES "t1" WRITE;
 /*!40000 ALTER TABLE "t1" DISABLE KEYS */;
@@ -377,12 +371,12 @@ set global sql_mode='ANSI_QUOTES';
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -405,12 +399,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS "t1";
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE "t1" (
   "a" int(11) DEFAULT NULL
 );
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES "t1" WRITE;
 /*!40000 ALTER TABLE "t1" DISABLE KEYS */;
@@ -440,12 +434,12 @@ insert into t1 values (1),(2),(3);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
@@ -534,12 +528,12 @@ INSERT INTO t1  VALUES (_latin1 'ÄÖÜß');
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` char(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -570,12 +564,9 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` char(10) DEFAULT NULL
 ) TYPE=MyISAM;
-SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -596,12 +587,9 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` char(10) DEFAULT NULL
 ) TYPE=MyISAM;
-SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -622,12 +610,9 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
 CREATE TABLE `t1` (
   `a` char(10) DEFAULT NULL
 ) TYPE=MyISAM;
-SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -661,12 +646,12 @@ INSERT INTO t2 VALUES (4),(5),(6);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t2`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
@@ -702,12 +687,12 @@ INSERT INTO `t1` VALUES (0x6020100002801
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `b` blob
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -743,12 +728,12 @@ INSERT INTO t1 VALUES (4),(5),(6);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -777,12 +762,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t1` VALUES (1),(2),(3),(4),(5),(6);
@@ -1146,8 +1131,8 @@ insert into t1 (F_8d3bba7425e7c98c50f52c
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `F_c4ca4238a0b923820dcc509a6f75849b` int(11) DEFAULT NULL,
   `F_c81e728d9d4c2f636f067f89cc14862c` int(11) DEFAULT NULL,
@@ -1480,7 +1465,7 @@ CREATE TABLE `t1` (
   `F_6faa8040da20ef399b63a72d0e4ab575` int(11) DEFAULT NULL,
   `F_fe73f687e5bc5280214e0486b273a5f9` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -1521,12 +1506,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -1565,19 +1550,19 @@ INSERT INTO t2 VALUES (1), (2);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS `t2`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -1600,19 +1585,19 @@ SET character_set_client = @saved_cs_cli
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS `t2`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -1813,26 +1798,26 @@ create table t3(a int);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t3`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t3` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS `t2`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -1862,12 +1847,12 @@ mysqldump: Got error: 1064: You have an
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
@@ -1898,15 +1883,15 @@ insert into t1 values (0815, 4711, 2006)
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS "t1";
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE "t1" (
   "a b" int(11) NOT NULL DEFAULT '0',
   "c""d" int(11) NOT NULL DEFAULT '0',
   "e`f" int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY ("a b","c""d","e`f")
 );
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES "t1" WRITE;
 /*!40000 ALTER TABLE "t1" DISABLE KEYS */;
@@ -1932,15 +1917,15 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a b` int(11) NOT NULL DEFAULT '0',
   `c"d` int(11) NOT NULL DEFAULT '0',
   `e``f` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`a b`,`c"d`,`e``f`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -1986,13 +1971,13 @@ create view v2 as select * from t2 where
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t2`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t2` (
   `a` varchar(30) DEFAULT NULL,
   KEY `a` (`a`(5))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
@@ -2082,12 +2067,12 @@ create view v1 as select * from t1;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2154,13 +2139,13 @@ create view v2 as select * from t2 where
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t2`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t2` (
   `a` varchar(30) DEFAULT NULL,
   KEY `a` (`a`(5))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
@@ -2221,12 +2206,12 @@ INSERT INTO t1 VALUES ('\'');
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` char(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2267,14 +2252,14 @@ select v3.a from v3, v1 where v1.a=v3.a
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   `c` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2426,13 +2411,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` bigint(20) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2498,12 +2483,12 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 DROP TABLE IF EXISTS `t2`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
@@ -2555,13 +2540,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` bigint(20) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2569,12 +2554,12 @@ INSERT INTO `t1` VALUES (1,NULL),(2,NULL
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
 DROP TABLE IF EXISTS `t2`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
@@ -2700,12 +2685,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `id` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2851,13 +2836,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `d` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   UNIQUE KEY `d` (`d`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2888,13 +2873,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `d` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   UNIQUE KEY `d` (`d`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2941,12 +2926,12 @@ a2
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS "t1 test";
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE "t1 test" (
   "a1" int(11) DEFAULT NULL
 );
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES "t1 test" WRITE;
 /*!40000 ALTER TABLE "t1 test" DISABLE KEYS */;
@@ -2970,12 +2955,12 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 DROP TABLE IF EXISTS "t2 test";
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE "t2 test" (
   "a2" int(11) DEFAULT NULL
 );
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES "t2 test" WRITE;
 /*!40000 ALTER TABLE "t2 test" DISABLE KEYS */;
@@ -3024,14 +3009,14 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(32) DEFAULT NULL,
   `c` varchar(32) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -3155,12 +3140,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/
 
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -3214,13 +3199,13 @@ insert into t1 values ('','');
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` binary(1) DEFAULT NULL,
   `b` blob
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -3249,13 +3234,13 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` binary(1) DEFAULT NULL,
   `b` blob
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -3428,12 +3413,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/
 
 USE `mysqldump_test_db`;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `id` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -3490,14 +3475,14 @@ create view nasishnasifu as select mysql
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_tables` /*!40100 DEFAULT CHARACTER SET latin1 */;
 
 USE `mysqldump_tables`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `basetable` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `tag` varchar(64) DEFAULT NULL,
   UNIQUE KEY `id` (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_views` /*!40100 DEFAULT CHARACTER SET latin1 */;
 
@@ -3664,31 +3649,31 @@ CREATE TABLE t1 (a INT) ENGINE=merge UNI
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t2`,`t3`);
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS `t2`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
 /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
 UNLOCK TABLES;
 DROP TABLE IF EXISTS `t3`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t3` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t3` WRITE;
 /*!40000 ALTER TABLE `t3` DISABLE KEYS */;
@@ -3768,13 +3753,13 @@ drop database mysqldump_test_db;
 #
 CREATE TABLE t1 (c1 INT, c2 LONGBLOB);
 INSERT INTO t1 SET c1=11, c2=REPEAT('q',509);
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` longblob
 );
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `t1` VALUES (11,0x7171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171);
 DROP TABLE t1;
 #
@@ -3832,6 +3817,87 @@ DROP TABLE t1,t2;
 
 -- Dump completed on DATE
 #
+# Bug#33550 mysqldump 4.0 compatibility broken
+#
+SET NAMES utf8;
+CREATE TABLE `straße` ( f1 INT );
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+DROP TABLE IF EXISTS `straße`;
+CREATE TABLE `straße` (
+  `f1` int(11) DEFAULT NULL
+) TYPE=MyISAM;
+
+LOCK TABLES `straße` WRITE;
+/*!40000 ALTER TABLE `straße` DISABLE KEYS */;
+/*!40000 ALTER TABLE `straße` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+DROP TABLE IF EXISTS `straße`;
+CREATE TABLE `straße` (
+  `f1` int(11) DEFAULT NULL
+) TYPE=MyISAM;
+
+LOCK TABLES `straße` WRITE;
+/*!40000 ALTER TABLE `straße` DISABLE KEYS */;
+/*!40000 ALTER TABLE `straße` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+DROP TABLE `straße`;
+CREATE TABLE `כדשגכחךלדגכחשך×SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+DROP TABLE IF EXISTS `כ’חכךלדגכ`;
+CREATE TABLE `כד—כךלדגכ` (
+  `f1` int(11) DEFAULT NULL
+) TYPE=MyISAM;
+
+LOCK TABLES `כדשגכ×דגכ` WRITE;
+/*!40000 ALTER TABLE `כדש›×š×œ×“×’×›` DISABLE KEYS */;
+/*!40000 ALTER TABLE `כדשגכחךלדגכחשךדגחכךלדגכ` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+DROP TABLE `כדשגכחךלדגכחשךדגחכךלדrop table if exists t1;
@@ -3851,13 +3917,13 @@ INSERT INTO t1 VALUES (3,4), (4,5);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -3946,12 +4012,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/
 
 USE `mysqldump_test_db`;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `id` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -4048,12 +4114,12 @@ create database `test-database`;
 use `test-database`;
 create table test (a int);
 DROP TABLE IF EXISTS `test`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `test` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 LOCK TABLES `test` WRITE;
 /*!40000 ALTER TABLE `test` DISABLE KEYS */;
 /*!40000 ALTER TABLE `test` ENABLE KEYS */;

=== modified file 'mysql-test/r/openssl_1.result'
--- a/mysql-test/r/openssl_1.result	2009-02-03 09:16:53 +0000
+++ b/mysql-test/r/openssl_1.result	2009-02-19 17:36:09 +0000
@@ -98,12 +98,12 @@ INSERT INTO t1 VALUES (1), (2);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 );
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -132,12 +132,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 );
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -166,12 +166,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 );
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;

=== modified file 'mysql-test/suite/falcon/r/falcon_bug_33148.result'
--- a/mysql-test/suite/falcon/r/falcon_bug_33148.result	2008-12-18 15:19:41 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_33148.result	2009-02-19 17:36:09 +0000
@@ -8,11 +8,11 @@ CREATE TABLESPACE TS1
   ADD DATAFILE 'ts1.fts'
   EXTENT_SIZE 0
   ENGINE=Falcon;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) /*!50100 TABLESPACE `ts1` */ ENGINE=Falcon DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE t1;
 DROP TABLESPACE ts1 ENGINE=Falcon;

=== modified file 'mysql-test/t/mysqldump.test'
--- a/mysql-test/t/mysqldump.test	2009-02-16 21:18:45 +0000
+++ b/mysql-test/t/mysqldump.test	2009-02-19 17:36:09 +0000
@@ -1649,6 +1649,24 @@ DROP TABLE t1,t2;
 
 
 --echo #
+--echo # Bug#33550 mysqldump 4.0 compatibility broken
+--echo #
+
+SET NAMES utf8;
+CREATE TABLE `straße` ( f1 INT );
+--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --default-character-set=utf8 --compatible=mysql323 test
+--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --default-character-set=latin1 --compatible=mysql323 test
+DROP TABLE `straße`;
+
+CREATE TABLE `כדשגכחךלדגכח×-exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --default-character-set=utf8 --compatible=mysql323 test
+--error 2
+--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --default-character-set=latin1 --compatible=mysql323 test
+DROP TABLE `כד—כךלדגכ`;
+SET NAMES latin1;
+
+
+--echo #
 --echo # End of 5.0 tests
 --echo #
 

Attachment: [text/bzr-bundle] bzr/azundris@mysql.com-20090224072212-51w0xg6doju2drup.bundle
Thread
bzr push into mysql-6.0-bugteam branch (azundris:3069) Tatiana A. Nurnberg24 Feb