An error occurred fetching the project authors.
  1. 10 Jun, 2006 1 commit
    • unknown's avatar
      Update result · d7b474e1
      unknown authored
      mysql-test/r/rpl_loaddata.result:
        Add missing drop table t1 to result
      d7b474e1
  2. 07 Feb, 2006 1 commit
    • unknown's avatar
      Update after merge 5.0 -> 5.1 · 7eefe3da
      unknown authored
      mysql-test/r/rpl_failed_optimize.result:
        Updates test result
      mysql-test/r/rpl_insert_id.result:
        Updates test result
      mysql-test/r/rpl_loaddata.result:
        Updates test result
      mysql-test/r/rpl_loaddata_s.result:
        Updates test result
      mysql-test/r/rpl_multi_update3.result:
        Updates test result
      7eefe3da
  3. 26 Jan, 2006 2 commits
    • unknown's avatar
      Add new option "check-testcases" to mysql-test-run.pl · 313ea47d
      unknown authored
      Cleanup the sideeffects from most of the  testcases with sideeffects.
      
      
      mysql-test/mysql-test-run.pl:
        Add option "check-testcases" to mysql-test-run.pl
        Will execute "include/check-testcase.test" once before each tescase and record the output into "var/tmp/check-testcase.result"
        After the teastcase it will run again and this time compare the output with previously recorded file.
      mysql-test/r/analyze.result:
        Drop table t1 at end of test
      mysql-test/r/create_select_tmp.result:
        Drop table t1 at end of test
      mysql-test/r/ctype_cp932.result:
        Drop table t1 at end of test
      mysql-test/r/ctype_recoding.result:
        Drop table t1 at end of test
      mysql-test/r/grant2.result:
        Drop user mysqltest_2 and mysqltest_A@'%'
      mysql-test/r/join_outer.result:
        Drop view v1 to cleanup
      mysql-test/r/ps_1general.result:
        Drop table t1 at end of test
      mysql-test/r/query_cache.result:
        Drop function "f1"
      mysql-test/r/read_only.result:
        Reset the "read_only" flag
      mysql-test/r/rpl000001.result:
        Remove user "blafasel2"
      mysql-test/r/rpl000017.result:
        Remove user "replicate"
      mysql-test/r/rpl_failed_optimize.result:
        Drop table t1 to cleanup
      mysql-test/r/rpl_flush_tables.result:
        Drop tables t3, t4, t5
      mysql-test/r/rpl_ignore_revoke.result:
        Delete user "user_foo"
      mysql-test/r/rpl_insert_id.result:
        Drop table t1 to cleanup
      mysql-test/r/rpl_loaddata.result:
        Drop tyable t1 to cleanup
      mysql-test/r/rpl_loaddata_rule_m.result:
        Drop tyable t1 to cleanup
      mysql-test/r/rpl_loaddata_rule_s.result:
        Drop tyable t1 to cleanup
      mysql-test/r/rpl_misc_functions.result:
        Drop tyable t1 to cleanup
      mysql-test/r/rpl_multi_update3.result:
        Drop tyable t1 and t2 to cleanup
      mysql-test/r/rpl_replicate_do.result:
        Drop tyable t1 to cleanup
      mysql-test/r/rpl_skip_error.result:
        Drop tyable t1 to cleanup
      mysql-test/r/rpl_slave_status.result:
        Drop tyable t1 to cleanup
      mysql-test/r/sp-prelocking.result:
        Drop view v1 and tables t1, t2, t3 and t4 to cleanup
      mysql-test/r/sp-security.result:
        Delete users to cleanup
        Delete remaining traces in tables_priv and procs_priv
      mysql-test/r/subselect_innodb.result:
        Drop procedure p1 to cleanup
      mysql-test/r/trigger-compat.result:
        Drop trigger wl2818_trg1 and wl2818_trg2.
        Drop table t1, t2
        Drop database mysqltest_db1
        And the users "mysqltest_dfn@localhost" and "mysqltest_inv@localhost"
      mysql-test/r/type_bit.result:
        Drop tables t1 and t2 to cleanup
      mysql-test/r/variables.result:
        Set GLOBAL max_join_size to 10 as it originally was in variables-master.opt
      mysql-test/r/view_grant.result:
        Dop user "test@localhost" to cleanup
      mysql-test/t/analyze.test:
        Drop table t1 to cleanup
      mysql-test/t/create_select_tmp.test:
        Drop table t1 to cleanup
      mysql-test/t/ctype_cp932.test:
        Drop table t1 to cleanup
      mysql-test/t/ctype_recoding.test:
        Drop table t1 to cleanup
      mysql-test/t/fulltext_var.test:
        Restore the original ft_boolean_syntax
      mysql-test/t/grant2.test:
        Drop users "mysqltest_2" and "mysqltest_A@'%'" to cleanup
      mysql-test/t/innodb_cache.test:
        Reset query_cache_size to original value
      mysql-test/t/join_outer.test:
        Drop view v1 to cleanup
      mysql-test/t/ps_1general.test:
        Drop table t1 to cleanup
      mysql-test/t/query_cache.test:
        Drop function "f1" to cleanup
      mysql-test/t/read_only.test:
        Reset the readonly flag
      mysql-test/t/rpl000001.test:
        Delete user "blafasel2" to cleanup
      mysql-test/t/rpl000017.test:
        Delete user "replicate" to cleanup
      mysql-test/t/rpl_failed_optimize.test:
        Drop table t1 to cleanup
      mysql-test/t/rpl_flush_tables.test:
        Droip table t3, t4 and t5 to cleanup
      mysql-test/t/rpl_ignore_revoke.test:
        Delet user "user_foo" to cleanup
      mysql-test/t/rpl_insert_id.test:
        drop table t1 to cleanup
      mysql-test/t/rpl_loaddata.test:
        Drop table t1 to cleanup
      mysql-test/t/rpl_loaddata_rule_m.test:
        Drop table t1 to cleanup
      mysql-test/t/rpl_loaddata_rule_s.test:
        Drop table t1 to cleanup
      mysql-test/t/rpl_misc_functions.test:
        Drop table t1 to cleanup
      mysql-test/t/rpl_multi_update3.test:
        Drop table t1 and t2 to cleanup
      mysql-test/t/rpl_replicate_do.test:
        Drop table t1 to cleanup
      mysql-test/t/rpl_skip_error.test:
        Drop table t1 to cleanup
      mysql-test/t/rpl_slave_status.test:
        Drop table t1 to cleanup
      mysql-test/t/sp-prelocking.test:
        Drop table t1, t2 t3 and t4 to cleanup
        Drop view v1
      mysql-test/t/sp-security.test:
        Delete  test users from mysql.user, mysql.db, mysql.procs_priv and mysql.tables_priv
        Drop table t1 to cleanup
      mysql-test/t/subselect_innodb.test:
        Drop procedure p1 to cleanup
      mysql-test/t/trigger-compat.test:
        Drop trigger wl2818_trg1 and wl2818_trg2 to cleanup
        Drop table t1, t2
        Drop users
        drop database mysqltest_db1
      mysql-test/t/type_bit.test:
        drop table t1 and t2 to cleanup
      mysql-test/t/variables-master.opt:
        Increase max_join_size to 100.
      mysql-test/t/variables.test:
        Set max_join_size to 10, which was the original value in variables-master.opt
      mysql-test/t/view_grant.test:
        Drop the user "test@localhost"
      mysql-test/include/check-testcase.test:
        New BitKeeper file ``mysql-test/include/check-testcase.test''
      313ea47d
    • unknown's avatar
      Update 5.1 to use MYSQLTEST_VARDIR · 484f5696
      unknown authored
      mysql-test/extra/rpl_tests/rpl_loaddata.test:
        Update to use std_data_ln
      mysql-test/mysql-test-run.pl:
        Add back variable path_mysqltest_log
      mysql-test/r/rpl_loaddata.result:
        Binlog offset changed when using std_data_ln instead of std_data
      mysql-test/r/rpl_stm_log.result:
        Binlog offset changed when using std_data_ln instead of std_data
      484f5696
  4. 24 Jan, 2006 1 commit
    • unknown's avatar
      Make it possible to run mysql-test-run.pl with default test suite in different vardir. · d40f7056
      unknown authored
      mysql-test/include/have_outfile.inc:
        Use MYSQLTEST_VARDIR
      mysql-test/include/test_outfile.inc:
        Use MYSQLTEST_VARDIR
      mysql-test/mysql-test-run.pl:
        Create variable $MYSQLTEST_VARDIR that points to  the vardir
        Don't create a symlink from var/ to the physical vardir if it's somewhere else
        Setup a symlink(or copy dir on windows) for std_data so it is available in the physical vardir
        Use "../tmp" as slave-load-tmpdir, since the server is started in var/master-data and slave in var/slave-data they will both find the dumps in "../tmp"
      mysql-test/mysql-test-run.sh:
        Export MYSQLTEST_VARDIR, always pointing at mysql-test/var
      mysql-test/r/backup.result:
        Use MYSQLTEST_VARDIR
      mysql-test/r/blackhole.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/loaddata.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/mysqlbinlog.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/mysqltest.result:
        Use MYSQLTEST_VARDIR
      mysql-test/r/outfile.result:
        Use MYSQLTEST_VARDIR
      mysql-test/r/query_cache.result:
        Add missing drop function
      mysql-test/r/rpl000001.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl000004.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl_innodb.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl_loaddata.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl_loaddata_rule_m.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl_loaddata_rule_s.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl_loaddatalocal.result:
        Use MYSQLTEST_VARDIR
      mysql-test/r/rpl_log.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl_misc_functions.result:
        Use MYSQLTEST_VARDIR
      mysql-test/r/rpl_replicate_do.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl_rewrite_db.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl_timezone.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/symlink.result:
        Use MYSQLTEST_VARDIR
      mysql-test/r/trigger.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/view.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/warnings.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/backup-master.sh:
        Use MYSQLTEST_VARDIR
      mysql-test/t/backup.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/blackhole.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/ctype_ucs_binlog.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/im_daemon_life_cycle-im.opt:
        Use MYSQLTEST_VARDIR
      mysql-test/t/im_options_set.imtest:
        Use MYSQLTEST_VARDIR
      mysql-test/t/im_options_unset.imtest:
        Use MYSQLTEST_VARDIR
      mysql-test/t/loaddata.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/myisam.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/mysqlbinlog.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/mysqlbinlog2.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/mysqldump.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/mysqltest.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/ndb_autodiscover.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/outfile.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/query_cache.test:
        Add missing drop function
      mysql-test/t/repair.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl000001.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl000004.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl000009.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl000015-slave.sh:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl000017-slave.sh:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_EE_error.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_charset.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_drop_db.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_flush_log_loop-master.opt:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_flush_log_loop-master.sh:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_flush_log_loop-slave.opt:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_flush_log_loop-slave.sh:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_innodb.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl_loaddata.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl_loaddata_rule_m.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl_loaddata_rule_s.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl_loaddatalocal.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_log.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl_misc_functions-slave.sh:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_misc_functions.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_replicate_do.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl_rewrite_db.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl_rotate_logs-slave.sh:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_rotate_logs.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_timezone.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/show_check.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/sp-destruct.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/symlink.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/temp_table-master.opt:
        Use MYSQLTEST_VARDIR
      mysql-test/t/trigger-compat.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/trigger-grant.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/trigger.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/type_varchar.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/user_var-binlog.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/view.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/warnings.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/include/sourced.inc:
        New BitKeeper file ``mysql-test/include/sourced.inc''
      mysql-test/include/sourced1.inc:
        New BitKeeper file ``mysql-test/include/sourced1.inc''
      d40f7056
  5. 23 Jan, 2006 1 commit
  6. 22 Dec, 2005 1 commit
    • unknown's avatar
      WL#1012: All changes as one single changeset. · 09346e6e
      unknown authored
      This includes both code and test cases.
      
      
      BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
        Delete: mysql-test/r/ctype_ucs_binlog.result
      BitKeeper/deleted/.del-rpl_delete_all.result~7c050d592614b3f:
        Delete: mysql-test/r/rpl_delete_all.result
      BitKeeper/deleted/.del-rpl000013-slave.opt~18266ad8a2403e8d:
        Delete: mysql-test/t/rpl000013-slave.opt
      BitKeeper/deleted/.del-rpl_delete_all.test~700a1490277780e0:
        Delete: mysql-test/t/rpl_delete_all.test
      mysql-test/extra/binlog_tests/binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/blackhole.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/ctype_cp932.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/drop_temp_table.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/insert_select-binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_ddl.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_deadlock.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_err_ignoredtable.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_loaddata_m.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_log.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_multi_query.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_reset_slave.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_stm_000001.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_stm_EE_err.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_stm_charset.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_user_variables.test:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_binlog.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_blackhole.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_ctype_cp932.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_ctype_ucs.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_drop_tmp_tbl.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_insert_select.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_000012.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_000015.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_deadlock_innodb.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_flushlog_loop.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_loaddata_s.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_000001.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_EE_err.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_charset.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_ddl.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_err_ignoredtable.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_flsh_tbls.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_loaddata_m.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_log.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_max_relay_size.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_multi_query.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_mystery22.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_reset_slave.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_rewrt_db.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_sp.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_timezone.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_until.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_user_variables.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_view.result:
        Import patch wl1012.patch
      mysql-test/t/binlog_row_binlog-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_000012.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_000015-slave.sh:
        Import patch wl1012.patch
      mysql-test/t/rpl_000015.slave-mi:
        Import patch wl1012.patch
      mysql-test/t/rpl_000015.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_deadlock_innodb-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-master.sh:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-slave.sh:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_loaddata_s-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_loaddata_s.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_000001-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_err_ignoredtable-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_loaddata_m-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_log-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_log-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_mystery22.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_rewrt_db-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_rewrt_db.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_sp-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_sp-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_sp.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_timezone-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_timezone-slave.opt:
        Import patch wl1012.patch
      BUILD/SETUP.sh:
        Import patch wl1012.patch
      Makefile.am:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_timezone.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_until.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_view.test:
        Import patch wl1012.patch
      client/Makefile.am:
        Import patch wl1012.patch
      client/client_priv.h:
        Import patch wl1012.patch
      client/mysqlbinlog.cc:
        Import patch wl1012.patch
      configure.in:
        Import patch wl1012.patch
      include/Makefile.am:
        Import patch wl1012.patch
      include/base64.h:
        Import patch wl1012.patch
      include/config-win.h:
        Import patch wl1012.patch
      include/my_base.h:
        Import patch wl1012.patch
      include/my_global.h:
        Import patch wl1012.patch
      mysql-test/Makefile.am:
        Import patch wl1012.patch
      mysql-test/mysql-test-run.pl:
        Import patch wl1012.patch
      mysql-test/mysql-test-run.sh:
        Import patch wl1012.patch
      mysql-test/r/date_formats.result:
        Import patch wl1012.patch
      mysql-test/r/flush_block_commit.result:
        Import patch wl1012.patch
      mysql-test/r/innodb.result:
        Import patch wl1012.patch
      mysql-test/r/rpl000017.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_change_master.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_commit_after_flush.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_create_database.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_do_grant.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_loaddata.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_log_pos.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_multi_delete.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_multi_update.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_openssl.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_replicate_do.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_rotate_logs.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_server_id1.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_server_id2.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_temporary.result:
        Import patch wl1012.patch
      mysql-test/r/user_var-binlog.result:
        Import patch wl1012.patch
      mysql-test/t/create_select_tmp.test:
        Import patch wl1012.patch
      mysql-test/t/date_formats.test:
        Import patch wl1012.patch
      mysql-test/t/disabled.def:
        Import patch wl1012.patch
      mysql-test/t/innodb.test:
        Import patch wl1012.patch
      mysql-test/t/mysqlbinlog.test:
        Import patch wl1012.patch
      mysql-test/t/mysqlbinlog2.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000002.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000006.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000013.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000017.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_auto_increment.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_change_master.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_commit_after_flush.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_create_database.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_do_grant.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_drop.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_empty_master_crash.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_failed_optimize.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_heap.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_insert_id.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_insert_ignore.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_loaddata.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_log_pos.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_delete.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_update.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_update2.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_update3.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_openssl.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_redirect.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_relayrotate.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_replicate_do.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_rotate_logs.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_server_id1.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_sp_effects.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_temporary.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_trigger.test:
        Import patch wl1012.patch
      mysql-test/t/sp.test:
        Import patch wl1012.patch
      mysql-test/t/user_var-binlog.test:
        Import patch wl1012.patch
      mysys/Makefile.am:
        Import patch wl1012.patch
      mysys/base64.c:
        Import patch wl1012.patch
      sql/Makefile.am:
        Import patch wl1012.patch
      sql/ha_innodb.cc:
        Import patch wl1012.patch
      sql/ha_innodb.h:
        Import patch wl1012.patch
      sql/ha_partition.cc:
        Import patch wl1012.patch
      sql/handler.cc:
        Import patch wl1012.patch
      sql/handler.h:
        Import patch wl1012.patch
      sql/item_sum.cc:
        Import patch wl1012.patch
      sql/log.cc:
        Import patch wl1012.patch
      sql/log_event.cc:
        Import patch wl1012.patch
      sql/log_event.h:
        Import patch wl1012.patch
      sql/mysql_priv.h:
        Import patch wl1012.patch
      sql/mysqld.cc:
        Import patch wl1012.patch
      sql/rpl_filter.h:
        Import patch wl1012.patch
      sql/set_var.cc:
        Import patch wl1012.patch
      sql/share/errmsg.txt:
        Import patch wl1012.patch
      sql/slave.cc:
        Import patch wl1012.patch
      sql/slave.h:
        Import patch wl1012.patch
      sql/sp.cc:
        Import patch wl1012.patch
      sql/sp_head.cc:
        Import patch wl1012.patch
      sql/sql_acl.cc:
        Import patch wl1012.patch
      sql/sql_base.cc:
        Import patch wl1012.patch
      sql/sql_class.cc:
        Import patch wl1012.patch
      sql/sql_class.h:
        Import patch wl1012.patch
      sql/sql_delete.cc:
        Import patch wl1012.patch
      sql/sql_insert.cc:
        Import patch wl1012.patch
      sql/sql_lex.h:
        Import patch wl1012.patch
      sql/sql_list.h:
        Import patch wl1012.patch
      sql/sql_load.cc:
        Import patch wl1012.patch
      sql/sql_parse.cc:
        Import patch wl1012.patch
      sql/sql_plugin.cc:
        Import patch wl1012.patch
      sql/sql_rename.cc:
        Import patch wl1012.patch
      sql/sql_repl.h:
        Import patch wl1012.patch
      sql/sql_select.cc:
        Import patch wl1012.patch
      sql/sql_show.cc:
        Import patch wl1012.patch
      sql/sql_table.cc:
        Import patch wl1012.patch
      sql/sql_udf.cc:
        Import patch wl1012.patch
      sql/sql_union.cc:
        Import patch wl1012.patch
      sql/sql_update.cc:
        Import patch wl1012.patch
      sql/sql_yacc.yy:
        Import patch wl1012.patch
      sql/table.cc:
        Import patch wl1012.patch
      sql/table.h:
        Import patch wl1012.patch
      storage/innobase/include/lock0lock.h:
        Import patch wl1012.patch
      storage/innobase/include/row0mysql.h:
        Import patch wl1012.patch
      storage/innobase/include/row0vers.h:
        Import patch wl1012.patch
      storage/innobase/lock/lock0lock.c:
        Import patch wl1012.patch
      storage/innobase/row/row0mysql.c:
        Import patch wl1012.patch
      storage/innobase/row/row0sel.c:
        Import patch wl1012.patch
      storage/innobase/row/row0vers.c:
        Import patch wl1012.patch
      09346e6e
  7. 25 Mar, 2005 1 commit
    • unknown's avatar
      WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero. · f07e4850
      unknown authored
      This saves one byte per Query_log_event on disk compared to 5.0.[0..3]. Compatibility problems with 5.0.x where x<4
      are explained in the comments in log_event.cc. Putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had
      been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just
      before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE.
      If slave fails in Execute_load_query_log_event::exec_event(),
      don't delete the file (so that it's re-usable at next START SLAVE).
      And (youpi!) fix for BUG#3247 "a partially completed LOAD DATA INFILE is not
      executed at all on the slave" (storing an Execute_load_query_log_event
      to binlog, with its error code, instead of Delete_file_log_event).
      
      
      mysql-test/r/mix_innodb_myisam_binlog.result:
        we now use one less byte when storing the catalog in binlog so positions change
      mysql-test/r/rpl_change_master.result:
        we now use one less byte when storing the catalog in binlog so positions change
      mysql-test/r/rpl_deadlock.result:
        we now use one less byte when storing the catalog in binlog so positions change
      mysql-test/r/rpl_error_ignored_table.result:
        we now use one less byte when storing the catalog in binlog so positions change
      mysql-test/r/rpl_flush_log_loop.result:
        we now use one less byte when storing the catalog in binlog so positions change
      mysql-test/r/rpl_loaddata.result:
        we now use one less byte when storing the catalog in binlog so positions change.
        Plus testing replication of LOAD DATA INFILE if duplicate key and non-transactional table.
      mysql-test/r/rpl_log.result:
        we now use one less byte when storing the catalog in binlog so positions change
      mysql-test/r/rpl_max_relay_size.result:
        we now use one less byte when storing the catalog in binlog so positions change
      mysql-test/r/rpl_relayrotate.result:
        we now use one less byte when storing the catalog in binlog so positions change
      mysql-test/r/rpl_replicate_do.result:
        we now use one less byte when storing the catalog in binlog so positions change
      mysql-test/r/rpl_rotate_logs.result:
        we now use one less byte when storing the catalog in binlog so positions change
      mysql-test/r/rpl_until.result:
        we now use one less byte when storing the catalog in binlog so positions change
      mysql-test/t/mysqlbinlog.test:
        we now use one less byte when storing the catalog in binlog so positions change
      mysql-test/t/mysqlbinlog2.test:
        we now use one less byte when storing the catalog in binlog so positions change
      mysql-test/t/rpl_deadlock.test:
        we now use one less byte when storing the catalog in binlog so positions change
      mysql-test/t/rpl_loaddata.test:
        we now use one less byte when storing the catalog in binlog so positions change.
        Plus testing replication of LOAD DATA INFILE if duplicate key and non-transactional table.
      mysql-test/t/rpl_until.test:
        we now use one less byte when storing the catalog in binlog so positions change
      sql/log_event.cc:
        a) We now store the catalog in Query_log_event in binlog WITHOUT its end zero.
        This saves one byte per Query_log_event on disk. Compatibility problems with 5.0.x where x<4
        are explained in the comments in this file.
        b) putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had
        been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just
        before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE.
        c) if slave fails in Execute_load_query_log_event::exec_event(),
        don't delete the file (so that it's re-usable at next START SLAVE).
      sql/log_event.h:
        We now store the catalog in Query_log_event in binlog WITHOUT its end zero.
        This saves one byte per Query_log_event on disk. This new storage for
        the catalog is denoted by Q_CATALOG_NZ_CODE (couldn't re-use Q_CATALOG_CODE
        as 5.0.3 slaves of this 5.0.4 master would segfault because it would
        expect a 0 when there is none.
        Renaming get_open_mode() to get_create_or_append() (see log_event.cc)
      sql/sql_load.cc:
        Fix for BUG#3247: if LOAD DATA INFILE fails but has permanently updated a table
        (i.e. has deleted/added/modified some rows in a non-transactional table),
        we must write an Execute_load_query_log_event to binlog (with the error code,
        as this class beautifully inherits from Query_log_event, it can store
        the error code - thanks Dmitri) and not a Delete_file_log_event (we use
        to write a Delete_file_log_event: no update happened on slave, bug).
      f07e4850
  8. 16 Mar, 2005 1 commit
    • unknown's avatar
      WL#874 "Extended LOAD DATA". · 5f75c8f5
      unknown authored
      Now one can use user variables as target for data loaded from file
      (besides table's columns). Also LOAD DATA got new SET-clause in which
      one can specify values for table columns as expressions.
      
      For example the following is possible:
      LOAD DATA INFILE 'words.dat' INTO TABLE t1 (a, @b) SET c = @b + 1;
      
      This patch also implements new way of replicating LOAD DATA.
      Now we do it similarly to other queries.
      We store LOAD DATA query in new Execute_load_query event
      (which is last in the sequence of events representing LOAD DATA).
      When we are executing this event we simply rewrite part of query which
      holds name of file (we use name of temporary file) and then execute it
      as usual query. In the beggining of this sequence we use Begin_load_query
      event which is almost identical to Append_file event
      
      
      client/mysqlbinlog.cc:
        Added support of two new binary log events Begin_load_query_log_event and
        Execute_load_query_log_Event which are used to replicate LOAD DATA INFILE.
      mysql-test/r/ctype_ucs.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
      mysql-test/r/insert_select.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
      mysql-test/r/loaddata.result:
        Added tests for new LOAD DATA features.
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results (don't dare to get rid from binlog positions
        completely since it seems that this test uses them).
      mysql-test/r/mysqlbinlog.result:
        New approach for binlogging of LOAD DATA statement. Now we store it as
        usual query and rewrite part in which file is specified when needed.
        So now mysqlbinlog output for LOAD DATA much more closer to its initial
        form. Updated test'd results accordingly.
      mysql-test/r/mysqldump.result:
        Made test more robust to other tests failures.
      mysql-test/r/rpl000015.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_change_master.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results.
      mysql-test/r/rpl_charset.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly
      mysql-test/r/rpl_deadlock.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly
      mysql-test/r/rpl_error_ignored_table.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
      mysql-test/r/rpl_flush_log_loop.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_flush_tables.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
      mysql-test/r/rpl_loaddata.result:
        New way of replicating LOAD DATA. Now we do it similarly to other
        queries. We store LOAD DATA query in new Execute_load_query event
        (which is last in the sequence of events representing LOAD DATA).
        When we are executing this event we simply rewrite part of query which
        holds name of file (we use name of temporary file) and then execute it
        as usual query. In the beggining of this sequence we use Begin_load_query
        event which is almost identical to Append_file event...
        
        Updated test's results wwith new binlog positions.
      mysql-test/r/rpl_loaddata_rule_m.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
        Since now LOAD DATA is replicated much in the same way as usual query
        --binlog_do/ignore_db work for it inthe same way as for usual queries.
      mysql-test/r/rpl_loaddata_rule_s.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_loaddatalocal.result:
        Added nice test for case when it is important that LOAD DATA LOCAL
        ignores duplicates.
      mysql-test/r/rpl_log.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly (don't dare to get rid from binlog 
        positions completely since it seems that this test uses them).
      mysql-test/r/rpl_log_pos.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_max_relay_size.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_multi_query.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_relayrotate.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_replicate_do.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_reset_slave.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_rotate_logs.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_server_id1.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_server_id2.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_temporary.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
      mysql-test/r/rpl_timezone.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
      mysql-test/r/rpl_until.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly and tweaked test a bit to bring it
        back to good shape.
      mysql-test/r/rpl_user_variables.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
      mysql-test/r/user_var.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
      mysql-test/t/ctype_ucs.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly and made it more robust for future similar
        changes.
      mysql-test/t/insert_select.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly and made it more robust for future similar
        changes.
      mysql-test/t/loaddata.test:
        Added test cases for new LOAD DATA functionality.
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly.
      mysql-test/t/mysqlbinlog.test:
        New way of replicating LOAD DATA local. Now we do it similarly to other
        queries. We store LOAD DATA query in new Execute_load_query event
        (which is last in the sequence of events representing LOAD DATA).
        When we are executing this event we simply rewrite part of query which
        holds name of file (we use name of temporary file) and then execute it
        as usual query. In the beggining of this sequence we use Begin_load_query
        event which is almost identical to Append_file event...
        
        Thus we need new binlog positions for LOAD DATA events.
      mysql-test/t/mysqlbinlog2.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly.
      mysql-test/t/mysqldump.test:
        Made test more robust for failures of other tests.
      mysql-test/t/rpl_charset.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly.
      mysql-test/t/rpl_deadlock.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly.
      mysql-test/t/rpl_error_ignored_table.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly and made it more robust for future similar
        changes.
      mysql-test/t/rpl_flush_tables.test:
        Addition of two new types of binary log events shifted binlog positions.
        Made test more robust for future similar changes.
      mysql-test/t/rpl_loaddata.test:
        New way of replicating LOAD DATA. Now we do it similarly to other
        queries. We store LOAD DATA query in new Execute_load_query event
        (which is last in the sequence of events representing LOAD DATA).
        When we are executing this event we simply rewrite part of query which
        holds name of file (we use name of temporary file) and then execute it
        as usual query. In the beggining of this sequence we use Begin_load_query
        event which is almost identical to Append_file event...
        
        Apropritely updated comments in test.
      mysql-test/t/rpl_loaddata_rule_m.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly and made it more robust for future similar 
        changes.
        Since now LOAD DATA is replicated much in the same way as usual query
        --binlog_do/ignore_db work for it inthe same way as for usual queries.
      mysql-test/t/rpl_loaddata_rule_s.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly.
      mysql-test/t/rpl_loaddatalocal.test:
        Added nice test for case when it is important that LOAD DATA LOCAL
        ignores duplicates.
      mysql-test/t/rpl_log.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly (don't dare to get rid from binlog positions
        completely since it seems that this test uses them).
      mysql-test/t/rpl_log_pos.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly.
      mysql-test/t/rpl_multi_query.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly.
      mysql-test/t/rpl_temporary.test:
        Addition of two new types of binary log events shifted binlog positions.
        Made test more robust for future similar changes.
      mysql-test/t/rpl_timezone.test:
        Addition of two new types of binary log events shifted binlog positions.
        Made test more robust for future similar changes.
      mysql-test/t/rpl_until.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly and tweaked it a bit to bring it back to good
        shape.
      mysql-test/t/rpl_user_variables.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly and made it more robust for future similar
        changes.
      mysql-test/t/user_var.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly and made it more robust for future similar
        changes.
      sql/item_func.cc:
        Added Item_user_var_as_out_param class that represents user variable
        which used as out parameter in LOAD DATA.
        
        Moved code from Item_func_set_user_var::update_hash() function to
        separate static function to be able to reuse it in this new class.
      sql/item_func.h:
        Added Item_user_var_as_out_param class that represents user variable
        which used as out parameter in LOAD DATA.
      sql/log_event.cc:
        New way of replicating LOAD DATA. Now we do it similarly to other
        queries. We store LOAD DATA query in new Execute_load_query event
        (which is last in the sequence of events representing LOAD DATA).
        When we are executing this event we simply rewrite part of query which
        holds name of file (we use name of temporary file) and then execute it
        as usual query. In the beggining of this sequence we use Begin_load_query
        event which is almost identical to Append_file event.
      sql/log_event.h:
        New way of replicating LOAD DATA. Now we do it similarly to other
        queries. We store LOAD DATA query in new Execute_load_query event
        (which is last in the sequence of events representing LOAD DATA).
        When we are executing this event we simply rewrite part of query which
        holds name of file (we use name of temporary file) and then execute it
        as usual query. In the beggining of this sequence we use Begin_load_query
        event which is almost identical to Append_file event.
      sql/mysql_priv.h:
        Now mysql_load() has two more arguments. They are needed to pass list of
        columns and corresponding expressions from new LOAD DATA's SET clause.
      sql/share/errmsg.txt:
        Added new error message which is used to forbid loading of data from
        fixed length rows to variables.
      sql/sql_lex.h:
        Added LEX::fname_start/fname_end members. 
        They are pointers to part of LOAD DATA statement which should be
        rewritten during replication (file name + little extra).
      sql/sql_load.cc:
        Added support for extended LOAD DATA. 
        Now one can use user variables as target for data loaded from file 
        (besides table's columns). Also LOAD DATA got new SET-clause in which
        one can specify values for table columns as expressions.
        
        Updated mysql_load()/read_fixed_length()/read_sep_field() to support
        this functionality (now they can read data from file to both columns and
        variables and assign do calculations and assignments specified in SET
        clause).
        
        We also use new approach for LOAD DATA binlogging/replication.
      sql/sql_parse.cc:
        mysql_execute_command():
          Since now we have SET clause in LOAD DATA we should also check
          permissions for tables used in its expressions. Also mysql_load()
          has two more arguments to pass information about this clause.
      sql/sql_repl.cc:
        New way of replicating LOAD DATA. Now we do it similarly to other
        queries. We store LOAD DATA query in new Execute_load_query event
        (which is last in the sequence of events representing LOAD DATA).
        When we are executing this event we simply rewrite part of query which
        holds name of file (we use name of temporary file) and then execute it
        as usual query. In the beggining of this sequence we use Begin_load_query
        event which is almost identical to Append_file event.
      sql/sql_repl.h:
        struct st_load_file_info:
          Removed memebers which are no longer needed for LOAD DATA binnlogging.
      sql/sql_yacc.yy:
        Added support for extended LOAD DATA syntax. Now one can use
        user variables as target for data loaded from file (besides table's 
        columns). Also LOAD DATA got new SET-clause in which one can specify
        values for table columns as expressions.
        
        For example the following is possible:
        LOAD DATA INFILE 'words.dat' INTO TABLE t1 (a, @b) SET c = @b + 1;
        
        Also now we save pointers to the beginning and to the end of part of 
        LOAD DATA statement which should be rewritten during replication.
      5f75c8f5
  9. 16 Feb, 2005 1 commit
  10. 03 Feb, 2005 1 commit
    • unknown's avatar
      WL#1062 "log charset info into all Query_log_event": · 7636b12f
      unknown authored
      we store 7 bytes (1 + 2*3) in every Query_log_event.
      In the future if users want binlog optimized for small size and less safe,
      we could add --binlog-no-charset (and binlog-no-sql-mode etc): charset info
      is something by design optional (even if for now we don't offer possibility to disable it):
      it's not a binlog format change.
      We try to reduce the number of get_charset() calls in the slave SQL thread to a minimum
      by caching the charset read from the previous event (which will often be equal to the one of the current event).
      We don't use SET ONE_SHOT for charset-aware repl (we still do for timezones, will be fixed later).
      No more errors if one changes the global value of charset vars on master or slave
      (as we log charset info in all Query_log_event).
      Not fixing Load_log_event as it will be rewritten soon by Dmitri.
      Testing how mysqlbinlog behaves in rpl_charset.test.
      mysqlbinlog needs to know where charset file is (to be able to convert a charset number found
      in binlog (e.g. in User_var_log_event) to a charset name); mysql-test-run needs to pass
      the correct value for this option to mysqlbinlog.
      Many result udpates (adding charset info into every event shifts log_pos in SHOW BINLOG EVENTS).
      Roughly the same job is to be done for timezones :)
      
      
      client/mysqlbinlog.cc:
        mysqlbinlog needs charsets knowledge, to be able to convert a charset
        number found in binlog to a charset name (to be able to print things
        like this:
        SET @`a`:=_cp850 0x4DFC6C6C6572 COLLATE `cp850_general_ci`;
      mysql-test/mysql-test-run.sh:
        tell mysqlbinlog about charsets dir
      mysql-test/r/ctype_ucs.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/drop_temp_table.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/insert_select.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/mix_innodb_myisam_binlog.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/mysqlbinlog.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/mysqlbinlog2.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
        The log_pos shift is why the SET INSERT_ID=4 event changes position in the result.
      mysql-test/r/rpl_charset.result:
        Running mysqlbinlog to check how it behaves on charset stuff.
        SET ONE_SHOT is now gone.
        Repl of LOAD DATA INFILE is not yet charset-aware (will soon be, when WL#874 is pushed)
        and, anyway result has a dependency on the temp filename (SQL-LOAD-*-[0-9] which is not constant).
        No more errors if one changes global character sets.
      mysql-test/r/rpl_error_ignored_table.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/rpl_flush_log_loop.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/rpl_flush_tables.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/rpl_loaddata.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/rpl_loaddata_rule_m.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/rpl_log.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/rpl_max_relay_size.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/rpl_relayrotate.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/rpl_replicate_do.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/rpl_rotate_logs.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/rpl_temporary.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/rpl_timezone.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/rpl_user_variables.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/r/user_var.result:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      mysql-test/t/rpl_charset.test:
        Running mysqlbinlog to check how it behaves on charset stuff (so, need fixed timestamp).
        SET ONE_SHOT is not printed to binlog anymore, so no need to test if ::exec_event() works ok.
        Repl of LOAD DATA INFILE is not yet charset-aware (will soon be, when WL#874 is pushed)
        and, anyway result has a dependency on the temp filename (SQL-LOAD-*-[0-9] which is not constant).
        No more errors if one changes global character sets.
      mysql-test/t/rpl_user_variables.test:
        different binlogging of charsets results in shifted log_pos and
        one added SET @@CHARACTER_SET... per mysqlbinlog run.
      sql/log.cc:
        No more SET ONE_SHOT for charsets (remains for TZ until solved with Dmitri).
      sql/log_event.cc:
        We now log charset info in each Query_log_event in binlog. It's 2*3 = 6 bytes:
        session character_set_client, session collation_connection, session collation_server.
        Now we would need only one byte per variable, but Bar said 2 is safer for the future.
        When slave or mysqlbinlog reads that info, it needs to get_charset() on these numbers (so, 3 get_charset() calls),
        as most of the time the 6-byte charset info will be equal to the previous event's,
        we cache the previous event's charset and if equal, no need to get_charset().
        As "flags2", SQL_MODE, catalog, autoinc variables, charset info is not a permanent addition:
        in the future we can add options to the master to not log any of these, old 5.0 should be able
        to parse these.
        A little bit of cleanup on autoinc stuff in replication.
        Fixing a bug in Start_log_event_v3::exec_event() where we used rli->relay_log.description_event_for_exec->binlog_version
        while we should use binlog_version (if it's a 3.23 master, that's all that counts; not the fact that the relay log is
        in 5.0 format).
      sql/log_event.h:
        binlogging of charset info in each Query_log_event.
      sql/mysql_priv.h:
        comment
      sql/set_var.cc:
        checks to refuse change of global charset variables are removed: they were needed for 4.1->4.1
        but not for 5.0.3->5.0.3.
        Yes this opens a breach if one does 4.1->5.0.3, where the checks would still be needed. But these checks would need
        reading relay_log.description_event_for_queue, which is currently an object used in many places by the I/O
        thread and only it. So, currently we don't take mutexes for this object, and if we read the object in set_var.cc
        (client thread) we need to add mutexes everywhere, but the replication code is already too broken with mutexes
        now (no consistent use of mutexes); mutex usage in replication should be fixed but preferrably during/after
        multimaster coding as it's going to shuffle mutexes already.
      sql/set_var.h:
        Since we don't forbid global change of charset vars for replication/binlogging,
        don't need specific ::check() methods anymore
      sql/slave.cc:
        Some little debug info which has nothing to do with charsets.
        Disabling master's charset check when slave I/O thread connects.
        Functions for charset caching/invalidating in the slave SQL thread.
      sql/slave.h:
        Cached charset in the slave SQL thread.
      7636b12f
  11. 16 Jan, 2005 1 commit
    • unknown's avatar
      XA (not completely polished out yet) · 88bd301d
      unknown authored
      include/my_pthread.h:
        cleanup. don't use gcc extensions
      innobase/include/trx0sys.ic:
        Jan's fix for innobase_xa_prepare
      innobase/read/read0read.c:
        Jan's fix for innobase_xa_prepare
      innobase/trx/trx0trx.c:
        Jan's fix for innobase_xa_prepare
      mysql-test/include/varchar.inc:
        test fix
      mysql-test/r/ctype_ucs.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/drop_temp_table.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/insert_select.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/mix_innodb_myisam_binlog.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/myisam.result:
        test fix
      mysql-test/r/rpl000015.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_change_master.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_charset.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_error_ignored_table.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_flush_log_loop.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_flush_tables.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_loaddata.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_loaddata_rule_m.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_loaddata_rule_s.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_log.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_log_pos.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_max_relay_size.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_relayrotate.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_replicate_do.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_reset_slave.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_rotate_logs.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_server_id1.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_server_id2.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_temporary.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_timezone.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_until.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_user_variables.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/user_var.result:
        new log event - all binlog positions are changed :(
      mysql-test/t/ctype_ucs.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/mix_innodb_myisam_binlog.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/mysqlbinlog.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/mysqlbinlog2.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/rpl_charset.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/rpl_error_ignored_table.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/rpl_loaddata_rule_m.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/rpl_loaddata_rule_s.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/rpl_log.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/rpl_log_pos.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/rpl_user_variables.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/user_var.test:
        new log event - all binlog positions are changed :(
      mysys/hash.c:
        typo fixed
      sql/ha_berkeley.cc:
        handlerton framework
      sql/ha_berkeley.h:
        handlerton framework
      sql/ha_innodb.cc:
        handlerton framework
      sql/ha_innodb.h:
        handlerton framework
      sql/handler.cc:
        new transaction handling, handlerton framework, two-phase commit, XA support
      sql/handler.h:
        new transaction handling, handlerton framework, two-phase commit, XA support
      sql/lex.h:
        XA commands
      sql/log.cc:
        new transaction handling, handlerton framework, two-phase commit,
        XA support, tc-logging, TC_LOG_MMAP class
      sql/log_event.cc:
        Xid_log_event
      sql/log_event.h:
        Xid_log_event, LOG_EVENT_BINLOG_CLOSED_F flag
      sql/mysql_priv.h:
        wrapper for query_id++
      sql/mysqld.cc:
        new command-line options --log-tc, --log-tc-size, --tc-heuristic-recover,
        new status variables Tc_log_page_size, Tc_log_max_pages_used, Tc_log_page_waits.
        init/stop tc logging
      sql/set_var.h:
        warning fixed
      sql/share/errmsg.txt:
        XA error messages
      sql/sp_head.cc:
        s/query_id++/next_query_id()/
      sql/sql_base.cc:
        typo fixed. new transaction handling.
      sql/sql_class.cc:
        cleanup of THD.transaction
      sql/sql_class.h:
        TC_LOG classes, new status variables, new savepoint handling, XA support
      sql/sql_insert.cc:
        comments
      sql/sql_lex.cc:
        s/found_colon/found_semicolon/
      sql/sql_lex.h:
        SQLCOM_XA_xxx, XA related changes in Lex
      sql/sql_parse.cc:
        cleanup, XA commands, new savepoint handling
      sql/sql_repl.cc:
        two functions moved to log.cc
      sql/sql_repl.h:
        two functions moved to log.cc
      sql/sql_trigger.cc:
        s/lex.name_and_length/lex.ident/
      sql/sql_yacc.yy:
        XA commands, cleanup
      88bd301d
  12. 19 Dec, 2003 1 commit
    • unknown's avatar
      This is the final commit for Worklog tasks: · 62554f81
      unknown authored
         * A more dynamic binlog format which allows small changes (1064)
         * Log session variables in Query_log_event (1063)
      It contains a few bugfixes (which I made when running the testsuite).
      I carefully updated the results of the testsuite (i.e. I checked for every one,
      if the difference between .reject and .result could be explained).
      Apparently mysql-test-run --manager is broken in 4.1 and 5.0 currently,
      so I could neither run the few tests which require --manager, nor check
      that they pass nor modify their .result. But for builds, we don't run
      with --manager.
      Apart from --manager, the full testsuite passes, with Valgrind too (no errors).
      I'm going to push in the next minutes. Remains: update the manual.
      Note: by chance I saw that (in 4.1, in 5.0) rpl_get_lock fails when run alone;
      this is normal at it makes assumptions on thread ids. I will fix this one day
      in 4.1.
      
      
      mysql-test/r/rpl000015.result:
        result update
      mysql-test/r/rpl_change_master.result:
        result update
      mysql-test/r/rpl_error_ignored_table.result:
        result update
      mysql-test/r/rpl_flush_log_loop.result:
        result update
      mysql-test/r/rpl_flush_tables.result:
        result update
      mysql-test/r/rpl_loaddata.result:
        result update
      mysql-test/r/rpl_loaddata_rule_m.result:
        result update
      mysql-test/r/rpl_loaddata_rule_s.result:
        result update
      mysql-test/r/rpl_log.result:
        result update
      mysql-test/r/rpl_log_pos.result:
        result update
      mysql-test/r/rpl_max_relay_size.result:
        result update
      mysql-test/r/rpl_relayrotate.result:
        result update
      mysql-test/r/rpl_replicate_do.result:
        result update
      mysql-test/r/rpl_reset_slave.result:
        result update
      mysql-test/r/rpl_rotate_logs.result:
        result update
      mysql-test/r/rpl_session_var.result:
        result update
      mysql-test/r/rpl_temporary.result:
        result update
      mysql-test/r/rpl_trunc_binlog.result:
        result update
      mysql-test/r/rpl_until.result:
        result update
      mysql-test/r/rpl_user_variables.result:
        result update
      mysql-test/t/rpl000010-slave.opt:
        need to wait 2 events, because now we receive a Format_desc on top of the Rotate,
        when replication starts.
      mysql-test/t/rpl000015.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_change_master.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_empty_master_crash.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_error_ignored_table.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_flush_log_loop.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_loaddata.test:
        position update
      mysql-test/t/rpl_loaddata_rule_m.test:
        position update
      mysql-test/t/rpl_loaddata_rule_s.test:
        position update
      mysql-test/t/rpl_log.test:
        position update
      mysql-test/t/rpl_log_pos.test:
        position update
      mysql-test/t/rpl_max_relay_size.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_openssl.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_redirect.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_relayrotate-slave.opt:
        better options for this test
      mysql-test/t/rpl_relayrotate.test:
        using max() is better for debugging (it shows at which place the slave
        SQL thread resumed)
      mysql-test/t/rpl_replicate_do.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_reset_slave.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_rotate_logs.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_session_var.test:
        100 because password() is longer than 10 chars
      mysql-test/t/rpl_trunc_binlog.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_until.test:
        position update
      mysql-test/t/rpl_user_variables.test:
        position update
      sql/log.cc:
        Ensure that the Format_desc propagated on next relay logs does not trigger
        undue actions (like incrementing some positions or clearing some files).
      sql/log_event.cc:
        * When the slave SQL thread finds a Rotate/Format_desc/Stop in the middle of
        a transaction (then these were written by the slave itself to its relay log),
        it should not increment rli->group* variables, but only rli->event* ones.
        * When the slave SQL thread finds a Format_desc not to be ignored (not
        the same server id as the slave's), if it has log_pos==0 it must not trigger
        "unfinished transaction in master's binlog" (log_pos==0 is always a marker
        in the relay log to mean "this event was not at this place in the master's
        binlog": it's for fake Rotate events, and for Format_description events which the master had
        to send us for replication to start).
        * In the Query_log_event on disk, catalog is now terminated by '\0'.
        * thd->catalog must be set to 0 when some exec_event() terminate (otherwise
        double free).
      sql/slave.cc:
        * Fixes for a few bugs when ignoring events in the slave SQL thread:
          - do not decrement rli->slave_skip_counter if the event is an event
          related to the binlog or relay log itself (FORMAT_DESCRIPTION,
          ROTATE, STOP) because these events should never be skipped (or the slave
          will be confused). Usually the user wants to skip a query, not a Rotate... 
          - when we (re)connect to the master, we must free description_event_for_queue
          (otherwise memory leak when we reconnect). 
        * Changed a bit the code where we change description_event_for_queue,
        to make it look "safer".
        * Moved 'created=0' to log.cc where it is safer.
        * When the slave SQL thread finds a Rotate/Format_desc/Stop in the middle of
        a transaction (then these were written by the slave itself to its relay log),
        it should not increment rli->group* variables, but only rli->event* ones.
      sql/sql_class.h:
        a warning comment
      sql/sql_repl.cc:
        A mistake: I had passed a char* instead of char**
      62554f81
  13. 20 Nov, 2003 2 commits
    • unknown's avatar
      Use same style for SHOW MASTER STATUS fields as · c9a9fa8e
      unknown authored
      for SHOW SLAVE STATUS.
      
      
      c9a9fa8e
    • unknown's avatar
      Write slave status field names using consistent style. · 8a8fef22
      unknown authored
      (Initial caps for each word.) For example, instead of writing
      Until_condition, Until_Log_File, and Until_log_pos, write
      Until_Condition, Until_Log_File, and Until_Log_pos.
      
      
      mysql-test/r/rpl000015.result:
        Write slave status field names using consistent style.
      mysql-test/r/rpl_empty_master_crash.result:
        Write slave status field names using consistent style.
      mysql-test/r/rpl_error_ignored_table.result:
        Write slave status field names using consistent style.
      mysql-test/r/rpl_flush_log_loop.result:
        Write slave status field names using consistent style.
      mysql-test/r/rpl_loaddata.result:
        Write slave status field names using consistent style.
      mysql-test/r/rpl_log.result:
        Write slave status field names using consistent style.
      mysql-test/r/rpl_log_pos.result:
        Write slave status field names using consistent style.
      mysql-test/r/rpl_max_relay_size.result:
        Write slave status field names using consistent style.
      mysql-test/r/rpl_openssl.result:
        Write slave status field names using consistent style.
      mysql-test/r/rpl_redirect.result:
        Write slave status field names using consistent style.
      mysql-test/r/rpl_replicate_do.result:
        Write slave status field names using consistent style.
      mysql-test/r/rpl_reset_slave.result:
        Write slave status field names using consistent style.
      mysql-test/r/rpl_rotate_logs.result:
        Write slave status field names using consistent style.
      mysql-test/r/rpl_trunc_binlog.result:
        Write slave status field names using consistent style.
      mysql-test/r/rpl_until.result:
        Write slave status field names using consistent style.
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Write slave status field names using consistent style.
      mysql-test/t/rpl_max_relay_size.test:
        Write slave status field names using consistent style.
      sql/slave.cc:
        Write slave status field names using consistent style.
      8a8fef22
  14. 18 Nov, 2003 1 commit
    • unknown's avatar
      Fix for BUG#1870 · 80649ee8
      unknown authored
          "CHANGE MASTER makes SQL thread restart from coordinates of I/O thread".
          So, in CHANGE MASTER:
          when it seems reasonable that the user did not want to discontinue
          its replication (i.e. when he is not specifying host or port or master_log_file
          or master_log_pos; this will be documented), set the coordinates of the
          I/O thread to those of the SQL thread. This way, the SQL thread will see
          no discontinuity in the relay log (i.e. will skip no events), because
          the I/O thread will fill the brand new relay log with the events which
          are just after the position where the SQL thread had stopped
          (before CHANGE MASTER was issued).
          And a new test for this bug.
      
      
      mysql-test/r/rpl_loaddata.result:
        Now, after CHANGE MASTER the coordinates of the I/O thread are the last ones of the SQL thread, so result update.
      sql/sql_repl.cc:
        Fix for BUG#1870
        "CHANGE MASTER makes SQL thread restart from coordinates of I/O thread".
        So, in CHANGE MASTER:
        when it seems reasonable that the user did not want to discontinue
        its replication (i.e. when he is not specifying host or port or master_log_file
        or master_log_pos; this will be documented), set the coordinates of the
        I/O thread to those of the SQL thread. This way, the SQL thread will see
        no discontinuity in the relay log (i.e. will skip no events), because
        the I/O thread will fill the brand new relay log with the events which
        are just after the position where the SQL thread had stopped
        (before CHANGE MASTER was issued).
      80649ee8
  15. 09 Oct, 2003 1 commit
    • unknown's avatar
      Don't show Slave_IO_State in the testsuite (replace it with #) because it can't be predicted. · bc8f801b
      unknown authored
      I manually edited rpl_openssl.result because the test is skipped on my
      machine. Hope it's correct.
      
      
      mysql-test/r/rpl000015.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_error_ignored_table.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_flush_log_loop.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_loaddata.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_log.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_log_pos.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_max_relay_size.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_openssl.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_replicate_do.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_reset_slave.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_rotate_logs.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_trunc_binlog.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_until.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl000015.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_empty_master_crash.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_error_ignored_table.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_flush_log_loop.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_loaddata.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_log.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_log_pos.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_max_relay_size.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_openssl.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_redirect.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_replicate_do.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_reset_slave.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_rotate_logs.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_trunc_binlog.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_until.test:
        Don't show Slave_IO_State because it can't be predicted.
      bc8f801b
  16. 08 Oct, 2003 2 commits
    • unknown's avatar
      Final push for WL#1098: · a7a7a8ca
      unknown authored
      "Add a column "Timestamp_of_last_master_event_executed" in SHOW SLAVE STATUS".
      Finally this is adding
      - Slave_IO_State (a copy of the State column of SHOW PROCESSLIST for the I/O thread,
      so that the users, most of the time, has enough info with only SHOW SLAVE STATUS).
      - Seconds_behind_master. When the slave connects to the master it does SELECT UNIX_TIMESTAMP()
      on the master, computes the absolute difference between the master's and the slave's clock.
      It records the timestamp of the last event executed by the SQL thread, and does a
      small computation to find the number of seconds by which the slave is late.
      
      
      mysql-test/r/rpl000015.result:
        result update
      mysql-test/r/rpl_empty_master_crash.result:
        result update
      mysql-test/r/rpl_error_ignored_table.result:
        result update
      mysql-test/r/rpl_flush_log_loop.result:
        result update
      mysql-test/r/rpl_loaddata.result:
        result update
      mysql-test/r/rpl_log.result:
        result update
      mysql-test/r/rpl_log_pos.result:
        result update
      mysql-test/r/rpl_max_relay_size.result:
        result update
      mysql-test/r/rpl_redirect.result:
        result update
      mysql-test/r/rpl_replicate_do.result:
        result update
      mysql-test/r/rpl_reset_slave.result:
        result update
      mysql-test/r/rpl_rotate_logs.result:
        result update
      mysql-test/r/rpl_trunc_binlog.result:
        result update
      mysql-test/r/rpl_until.result:
        result update
      mysql-test/t/rpl000015.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_empty_master_crash.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_error_ignored_table.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_flush_log_loop.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_loaddata.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_log.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_log_pos.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_max_relay_size.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_openssl.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_redirect.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_replicate_do.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_reset_slave.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_rotate_logs.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_trunc_binlog.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_until.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      sql/log_event.cc:
        when the SQL thread executes an event, we record its timestamp
      sql/slave.cc:
        in check_master_version() we know read the master's clock, to know the clock difference
        with the slave.
        In show_master_info() we send the state of the I/O thread, and compute the number of
        seconds by which the slave is late.
      sql/slave.h:
        timestamp of the last master's event executed by the SQL thread,
        and difference between the clocks of the master and slave.
      sql/sql_repl.cc:
        clear the Seconds_behind_master column of SHOW SLAVE STATUS when RESET SLAVE or CHANGE MASTER.
      a7a7a8ca
    • unknown's avatar
      Fixes after merge · 1ead85e6
      unknown authored
      mysql-test/std_data/trunc_binlog.000001:
        Rename: mysql-test/std_data/trunc_binlog.001 -> mysql-test/std_data/trunc_binlog.000001
      client/mysqltest.c:
        Fixed merge problem
      mysql-test/mysql-test-run.sh:
        Fixed merge problem
      mysql-test/r/distinct.result:
        Fix after merge
      mysql-test/r/drop_temp_table.result:
        Fix after merge
      mysql-test/r/join_outer.result:
        Fix after merge
      mysql-test/r/mysqldump.result:
        Fix after merge
      mysql-test/r/null_key.result:
        Fix after merge
      mysql-test/r/order_by.result:
        Fix after merge
      mysql-test/r/rpl_alter.result:
        Fix after merge
      mysql-test/r/rpl_loaddata.result:
        Fix after merge
      mysql-test/r/rpl_loaddata_rule_m.result:
        Fix after merge
      mysql-test/r/rpl_trunc_binlog.result:
        Fix after merge
      mysql-test/r/select_safe.result:
        Fix after merge
      mysql-test/t/insert.test:
        Fix after merge
      mysql-test/t/mysqlbinlog.test:
        Fix after merge
      mysql-test/t/rpl000009.test:
        Fix after merge
      mysql-test/t/rpl_alter.test:
        Fix after merge
      mysql-test/t/rpl_loaddata_rule_m.test:
        Fix after merge
      mysql-test/t/rpl_trunc_binlog.test:
        Fix after merge
      sql-common/client.c:
        Fix after merge
      sql/item_subselect.cc:
        Fix after merge
      sql/repl_failsafe.cc:
        Fix after merge
      sql/slave.cc:
        Fix after merge
      sql/sql_insert.cc:
        Fix after merge
      1ead85e6
  17. 24 Sep, 2003 1 commit
    • unknown's avatar
      Fix for BUG#1391: · dae13b54
      unknown authored
      "If LOAD DATA INFILE 'small_file' fails on master, slave leaves temp files"
      (the bug is in the master)
      
      
      mysql-test/r/rpl_loaddata.result:
        result update
      mysql-test/std_data/rpl_loaddata2.dat:
        change to introduce a unique key violation
      mysql-test/t/rpl_loaddata.test:
        testcase for bug#1391.
      sql/sql_load.cc:
        fix for bug#1391:
        for a small file, we had in the binlog only the Create_file, not the Delete_file
        (the Create_file was written when the READ_INFO was destroyed).
      dae13b54
  18. 14 Sep, 2003 1 commit
    • unknown's avatar
      Post merge fixes. Fixed tests after adding UNTIL conditions · b15eba88
      unknown authored
      to SHOW SLAVE STATUS.
      
      
      mysql-test/r/rpl000015.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_empty_master_crash.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_error_ignored_table.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_flush_log_loop.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_loaddata.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_log.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_log_pos.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_max_relay_size.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_openssl.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_redirect.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_replicate_do.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_reset_slave.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_rotate_logs.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_until.result:
        Post merge fix
      mysql-test/t/rpl_until.test:
        Post merge fix
      b15eba88
  19. 11 Sep, 2003 1 commit
    • unknown's avatar
      After merge fixes. · dd0d199e
      unknown authored
      Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
      
      
      client/mysql.cc:
        After merge fix
      include/mysql.h:
        Some additions to MYSQL_BIND for cleaner prepared statement code
      libmysql/libmysql.c:
        mysql_prepare_result -> mysql_get_metadata()
        Added test for offset overflow when using mysql_fetch_column()
        Cleaned up mysql_fetch_column()
        Optimized fetch_result() usage
      mysql-test/r/func_group.result:
        Updated results after merge
      mysql-test/r/func_test.result:
        Updated results after merge
      mysql-test/r/grant.result:
        Updated results after merge
      mysql-test/r/loaddata.result:
        Updated results after merge
      mysql-test/r/lowercase_table.result:
        Updated results after merge
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Updated results after merge (note that this is still not correct; Need patch to mysqld to fix this properly)
      mysql-test/r/myisam.result:
        Updated results after merge
      mysql-test/r/range.result:
        Updated results after merge
      mysql-test/r/rpl_loaddata.result:
        Updated results after merge
      mysql-test/r/rpl_loaddata_rule_m.result:
        Updated results after merge
      mysql-test/r/rpl_loaddata_rule_s.result:
        Updated results after merge
      mysql-test/r/rpl_log.result:
        Updated results after merge
      mysql-test/r/union.result:
        Updated results after merge
      mysql-test/t/lowercase_table.test:
        Update after merge
      mysql-test/t/myisam.test:
        Update after merge
      mysql-test/t/union.test:
        Update after merge
      sql-bench/compare-results.sh:
        Fix for now output format
      sql/field.h:
        Added is_null_in_record() to make ha_innodb.cc code more general
      sql/ha_innodb.cc:
        Removed some functions that uses inernal (private) MySQL information
      sql/item_cmpfunc.cc:
        After merge fix
      sql/log_event.cc:
        After merge fix; (Some code should be checked by Guilhem)
      sql/opt_range.cc:
        Simple optimzation and after merge fixes
      sql/slave.cc:
        After merge fix
      sql/sql_acl.cc:
        After merge fix + code cleanup
      sql/sql_select.cc:
        After merge fix
      sql/sql_show.cc:
        After merge fix
      sql/sql_table.cc:
        After merge fix
        Cleanup of mysql_checksum_table()
      sql/sql_union.cc:
        After merge fixes.
        Note that after this the union test still fails; Will be fixed shortly...
      tests/client_test.c:
        mysql_prepare_result() -> mysql_get_metadata()
      dd0d199e
  20. 01 Sep, 2003 1 commit
    • unknown's avatar
      Updated various tests results which were missed during auto-merge · 651898ad
      unknown authored
      with replication over SSL patch.
      
      
      mysql-test/r/rpl_error_ignored_table.result:
        New SSL related fields in SHOW SLAVE STATUS
      mysql-test/r/rpl_loaddata.result:
        New SSL related fields in SHOW SLAVE STATUS
      mysql-test/r/rpl_max_relay_size.result:
        New SSL related fields in SHOW SLAVE STATUS
      mysql-test/r/rpl_openssl.result:
        Post merge update of SHOW SLAVE STATUS result
      mysql-test/r/rpl_reset_slave.result:
        New SSL related fields in SHOW SLAVE STATUS
      mysql-test/r/rpl_rotate_logs.result:
        Fixed bad manual merge result
      651898ad
  21. 22 Aug, 2003 1 commit
    • unknown's avatar
      2 minor edits, plus · fdfb10f2
      unknown authored
      fix for BUG#1113 "INSERT into non-trans table SELECT ; ROLLBACK" does not send warning"
      and
      fix for BUG#873 "In transaction, INSERT to non-trans table is written too early to binlog".
      Now we don't always write the non-trans update immediately to the binlog;
      if there is something in the binlog cache we write it to the binlog cache
      (because the non-trans update could depend on a trans table which was modified
      earlier in the transaction); then in case of ROLLBACK, we write the binlog
      cache to the binlog, wrapped with BEGIN/ROLLBACK.
      This guarantees that the slave does the same updates.
      For ROLLBACK TO SAVEPOINT: when we execute a SAVEPOINT command we write it
      to the binlog cache. At ROLLBACK TO SAVEPOINT, if some non-trans table was updated,
      we write ROLLBACK TO SAVEPOINT to the binlog cache; when the transaction
      terminates (COMMIT/ROLLBACK), the binlog cache will be flushed to the binlog
      (because of the non-trans update) so we'll have SAVEPOINT and ROLLBACK TO
      SAVEPOINT in the binlog.
      
      Apart from this rare case of updates of mixed table types in transaction, the
      usual way is still clear the binlog cache at ROLLBACK, or chop it at
      ROLLBACK TO SAVEPOINT (meaning the SAVEPOINT command is also chopped, which
      is fine).
      Note that BUG#873 encompasses subbugs 1) and 2) of BUG#333 "3 binlogging bugs when doing INSERT with mixed InnoDB/MyISAM".
      
      
      client/mysqldump.c:
        Minor edit: one CHANGE MASTER with 2 arguments instead of 2 CHANGE MASTER with one argument each.
      mysql-test/r/rpl_loaddata.result:
        result update
      mysql-test/t/rpl_loaddata.test:
        minor edit: simplifying the test.
      sql/handler.cc:
        Fix for BUG#873. See comments in code, and the description of the changeset.
      sql/log.cc:
        * Previously, if a query updated a non-transactional table we wrote it immediately
        to the real binlog. This causes a bug when the update is done inside a transaction
        and uses the content of an updated transactional table (because this makes
        a wrong order of queries in the binlog). So if the binlog cache is not empty,
        we write the query to the binlog cache; otherwise we can write it to the binlog.
        * Previously, when we flushed the binlog cache to the binlog, we wrapped it
        with BEGIN/COMMIT. Now it's also possible to wrap it with BEGIN/ROLLBACK, to handle
        transactions which update both transactional and non-transactional tables.
      sql/log_event.cc:
        The slave thread can leave a transaction if COMMIT or if ROLLBACK.
      sql/sql_class.h:
        prototype
      sql/sql_insert.cc:
        Fix for BUG#1113:
        this was because the INSERT SELECT code did not set OPTION_STATUS_NO_TRANS_UPDATE.
      sql/sql_parse.cc:
        Don't send ER_WARNING_NOT_COMPLETE_ROLLBACK if this is the SQL slave thread (see comments).
      fdfb10f2
  22. 20 Aug, 2003 2 commits
    • unknown's avatar
      Result updates after Dmitri's and my changes to logging with --log-slave-updates. · eb1fb900
      unknown authored
      Since my changes, rpl_log.test, whose result file depends on file_id, became
      non-repeatable, i.e. file_id on slave in SHOW BINLOG EVENTS
      changed depending on the order of tests (sometimes 1, sometimes 5).
      Which is logical: as now the slave does not copy Create_file and Exec_load from
      the relay log (i.e from the master's binlog) to the slave's binlog, but
      instead lets mysql_load() do the logging, the file_id is now the one whic
      was used on the slave. Before it was the one which was used on the master,
      and by chance the master was always restarted for this test because there's
      a -master.opt file, so file_id on the master is always 1. But now file_id is
      from the slave so we need to restart the slave. That's why I add an (empty)
      -slave.opt file. I could have used 'server_stop/start slave', but this
      would have required the manager, so most of the time mysql-test-run silently
      skip the test which makes it useless. And I want this test to be run !
      
      
      mysql-test/r/rpl_loaddata.result:
        Orig_log_pos is like Pos since Dmitri's good change for BUG#1086
      mysql-test/r/rpl_log.result:
        Orig_log_pos is like Pos now, because Exec_load events are not directly copied
        by the slave from the relay log to the slave's binary log (these events
        are written by mysql_load() now).
      mysql-test/t/rpl_log.test:
        A comment
      eb1fb900
    • unknown's avatar
      First commit for fixing BUG#1100 · 1542fffb
      unknown authored
      "LOAD DATA INFILE is badly filtered by binlog-*-db rules".
      There will probably be a second final one to merge Dmitri's changes
      to rpl_log.result and mine.
      2 new tests:
      rpl_loaddata_rule_m : test of logging of LOAD DATA INFILE when the master has binlog-*-db rules,
      rpl_loaddata_rule_s : test of logging of LOAD DATA INFILE when the slave has binlog-*-db rules and --log-slave-updates.
      
      
      mysql-test/r/rpl_loaddata.result:
        Test that logging of LOAD DATA INFILE is done on the slave
      mysql-test/t/rpl_loaddata.test:
        Test that logging of LOAD DATA is done on the slave
      sql/log.cc:
        debug info
      sql/log_event.cc:
        * Append_block, Exec_load and Delete_file now have a member 'db' like Create_file.
        This member is filled by mysql_load(). It is used for filtering by binlog-*-db rules,
        that's all. It's not written to the binlog, and so can't be read from the binlog.
        In other words, that's temporary info which is stored in the event and lost when
        it is written and deleted.
        * Better error messages in Append_block et al. events.
        * The slave now logs (log-slave-updates) the Create_file et al. events in mysql_load()
        (they are not directly copied from the events in the relay log, because this
        prevented filtering by binlog-*-db rules). Before, mysql_load() in the slave
        did no logging, now it does the logging, as in any regular thread.
      sql/log_event.h:
        New member 'db' for Append_block et al. events.
      sql/slave.cc:
        Removed useless code. Why was it useless:
        - CREATE_FILE_EVENT is not defined in 3.23. It appeared in 4.0.
        - in queue_old_event(), which is called only if the master is 3.23, we had a
        case CREATE_FILE_EVENT:
        so this case can be removed.
        - this case was the only caller of process_io_create_file() so this function
        can be removed.
      sql/sql_load.cc:
        Pass the db to events, so that they can be well filtered.
      sql/sql_repl.cc:
        Pass the db to events so that they can be well filtered.
      1542fffb
  23. 18 Aug, 2003 1 commit
    • unknown's avatar
      After merge fixes · 2901c3b8
      unknown authored
      Use server character set if --default-character-set is not used
      Added convert_string() for more efficient alloc+character-set convert of strings
      
      
      BitKeeper/deleted/.del-convert.result~a3b56e1db6f498e9:
        Delete: mysql-test/r/convert.result
      BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72:
        Delete: mysql-test/t/convert.test
      BitKeeper/deleted/.del-make_win_src_distribution.old~5c9ebdc4a852b43b:
        Delete: scripts/make_win_src_distribution.old
      client/mysql.cc:
        Use server character set if --default-character-set is not used
      client/mysqltest.c:
        Code cleanup (merge identical code)
        More debug messages
      heap/hp_create.c:
        After merge fix
      include/m_ctype.h:
        After merge fix
      include/my_global.h:
        Remove size_str (we already have size_s)
      include/mysql_com.h:
        After merge fix
      libmysql/libmysql.c:
        After merge fix
      libmysqld/Makefile.am:
        After merge fix
      mysql-test/r/auto_increment.result:
        After merge fix
      mysql-test/r/create.result:
        After merge fix
      mysql-test/r/ctype_latin1_de.result:
        After merge fix
      mysql-test/r/distinct.result:
        After merge fix
      mysql-test/r/drop.result:
        After merge fix
      mysql-test/r/fulltext.result:
        After merge fix
      mysql-test/r/func_gconcat.result:
        After merge fix
      mysql-test/r/func_str.result:
        After merge fix
      mysql-test/r/func_test.result:
        After merge fix
      mysql-test/r/grant.result:
        After merge fix
      mysql-test/r/group_by.result:
        After merge fix
      mysql-test/r/handler.result:
        After merge fix
      mysql-test/r/heap.result:
        After merge fix
      mysql-test/r/heap_btree.result:
        After merge fix
      mysql-test/r/heap_hash.result:
        After merge fix
      mysql-test/r/innodb.result:
        After merge fix
      mysql-test/r/insert.result:
        After merge fix
      mysql-test/r/insert_select.result:
        After merge fix
      mysql-test/r/join_outer.result:
        After merge fix
      mysql-test/r/key.result:
        After merge fix
      mysql-test/r/key_cache.result:
        After merge fix
      mysql-test/r/loaddata.result:
        After merge fix
      mysql-test/r/myisam.result:
        After merge fix
      mysql-test/r/null.result:
        After merge fix
      mysql-test/r/null_key.result:
        After merge fix
      mysql-test/r/order_by.result:
        After merge fix
      mysql-test/r/rpl_do_grant.result:
        After merge fix
      mysql-test/r/rpl_error_ignored_table.result:
        After merge fix
      mysql-test/r/rpl_ignore_grant.result:
        After merge fix
      mysql-test/r/rpl_loaddata.result:
        After merge fix
      mysql-test/r/rpl_log.result:
        After merge fix
      mysql-test/r/rpl_log_pos.result:
        After merge fix
      mysql-test/r/rpl_max_relay_size.result:
        After merge fix
      mysql-test/r/rpl_replicate_do.result:
        After merge fix
      mysql-test/r/rpl_reset_slave.result:
        After merge fix
      mysql-test/r/rpl_rotate_logs.result:
        After merge fix
      mysql-test/r/rpl_user_variables.result:
        After merge fix
      mysql-test/r/select.result:
        After merge fix
      mysql-test/r/select_safe.result:
        After merge fix
      mysql-test/r/subselect.result:
        After merge fix
      mysql-test/r/type_blob.result:
        After merge fix
      mysql-test/r/type_decimal.result:
        After merge fix
      mysql-test/r/type_float.result:
        After merge fix
      mysql-test/r/type_ranges.result:
        After merge fix
      mysql-test/r/type_time.result:
        After merge fix
      mysql-test/r/type_uint.result:
        After merge fix
      mysql-test/r/union.result:
        After merge fix
      mysql-test/r/warnings.result:
        After merge fix
      mysql-test/t/auto_increment.test:
        After merge fix
      mysql-test/t/case.test:
        After merge fix
      mysql-test/t/ctype_collate.test:
        After merge fix
      mysql-test/t/ctype_latin1_de.test:
        After merge fix
      mysql-test/t/drop.test:
        After merge fix
      mysql-test/t/func_in.test:
        After merge fix
      mysql-test/t/func_set.test:
        After merge fix
      mysql-test/t/func_str.test:
        After merge fix
      mysql-test/t/func_test.test:
        After merge fix
      mysql-test/t/grant.test:
        After merge fix
      mysql-test/t/group_by.test:
        After merge fix
      mysql-test/t/handler.test:
        After merge fix
      mysql-test/t/heap.test:
        After merge fix
      mysql-test/t/heap_btree.test:
        After merge fix
      mysql-test/t/heap_hash.test:
        After merge fix
      mysql-test/t/innodb.test:
        After merge fix
      mysql-test/t/insert_select.test:
        After merge fix
      mysql-test/t/key.test:
        After merge fix
      mysql-test/t/key_cache.test:
        After merge fix
      mysql-test/t/lock_tables_lost_commit-master.opt:
        After merge fix
      mysql-test/t/lock_tables_lost_commit.test:
        After merge fix
      mysql-test/t/myisam.test:
        After merge fix
      mysql-test/t/row.test:
        After merge fix
      mysql-test/t/subselect.test:
        After merge fix
      mysql-test/t/type_decimal.test:
        After merge fix
      mysql-test/t/type_ranges.test:
        After merge fix
      mysql-test/t/type_uint.test:
        After merge fix
      mysql-test/t/variables.test:
        After merge fix
      mysql-test/t/warnings.test:
        After merge fix
      scripts/make_win_src_distribution.sh:
        after merge fixes
      sql-common/client.c:
        After merge fix
        Change my_connect() to use poll()
        If character set is not given, use servers character set.
      sql/field.cc:
        After merge fix
        Don't give warnings when storing data in fields in optimizer.
      sql/ha_myisammrg.h:
        After merge fix
      sql/log.cc:
        After merge fix
      sql/log_event.cc:
        After merge fix
      sql/mysqld.cc:
        After merge fix
      sql/opt_range.cc:
        After merge fix
      sql/set_var.cc:
        Code cleanup
        Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps
      sql/set_var.h:
        Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps
      sql/slave.cc:
        After merge fix
      sql/sql_acl.cc:
        After merge fix
        Code cleanup
      sql/sql_class.cc:
        Added convert_string() for more efficient alloc+character-set convert of strings
        Add cached flags to avoid calling mysql_charset_same() during parsing.
      sql/sql_class.h:
        Added convert_string() for more efficient alloc+character-set convert of strings
        Add cached flags to avoid calling mysql_charset_same() during parsing.
      sql/sql_handler.cc:
        After merge fix
      sql/sql_lex.h:
        After merge fix
      sql/sql_parse.cc:
        Optimize and fix memory reference errors reported by valgrind
      sql/sql_repl.cc:
        After merge fix
      sql/sql_yacc.yy:
        After merge fix
        Avoid calling mysql_charset_same() when parsing identifiers
      strings/ctype-latin1.c:
        Port latin_de conversion code from 4.0
      2901c3b8
  24. 04 Aug, 2003 1 commit
    • unknown's avatar
      2 bugfixes: · d8df84aa
      unknown authored
      - Bug #985: "Between RESET SLAVE and START SLAVE, SHOW SLAVE STATUS is wrong."
      Now RESET SLAVE puts correct info in mi->host etc. A new test rpl_reset_slave
      for that.
      - Bug #986: "CHANGE MASTER & START SLAVE do not reset error columns in SHOW
      SLAVE STATUS". Now these reset the errors.
      
      
      mysql-test/r/rpl_loaddata.result:
        result update.
      mysql-test/t/rpl_loaddata.test:
        Test that RESET SLAVE, START SLAVE and CHANGE MASTER all reset 
        Last_slave_error and Last_slave_errno (columns of SHOW SLAVE STATUS).
        We do it in this test because that's one of tests which have 
        an intentional query error on the slave.
      sql/slave.cc:
        As we need TWICE the code to copy command-line options (--master-host etc)
        to mi (we already had it in init_master_info, but we also need it in RESET
        SLAVE to fix bug#985), I make a function of this code.
        And a function to reset Last_slave_error and Last_slave_errno (we need
        it in CHANGE MASTER, RESET SLAVE, and at the start of the SQL thread).
      sql/slave.h:
        declarations for new functions.
      sql/sql_repl.cc:
        copy --master-host etc to mi in RESET SLAVE, so that SHOW SLAVE STATUS
        shows correct information.
      d8df84aa
  25. 23 Jul, 2003 1 commit
    • unknown's avatar
      temporary modification of rpl_loaddata.test until 4.0 is merged in 4.1. · 3be8c60c
      unknown authored
      This is to avoid a test failure, which is fixed in 4.0 in
      ChangeSet@1.1455.34.1, 2003-06-10 23:29:49+02:00, guilhem@mysql.com
      by making RESET SLAVE reset the error.
      
      
      mysql-test/r/rpl_loaddata.result:
        temporary modification until 4.0 is merged in 4.1
      mysql-test/t/rpl_loaddata.test:
        temporary modification until 4.0 is merged in 4.1
      3be8c60c
  26. 16 Jun, 2003 1 commit
    • unknown's avatar
      Fix for nightly build test failure (test update). · 366fd92e
      unknown authored
      More messages.
      Testcase for bug 651.
      
      
      client/mysqltest.c:
        More explicit error message if MASTER_POS_WAIT() returns NULL.
      mysql-test/r/rpl_loaddata.result:
        result update
      mysql-test/r/rpl_master_pos_wait.result:
        result update
      mysql-test/t/rpl000001.test:
        sync_with_master (=MASTER_POS_WAIT()) was called when we could expect the SQL slave thread had stopped.
        As I yesterday changed code so that "SQL thread stops => MASTER_POS_WAIT() returns NULL immediately" (bugfix),
        sync_with_master received NULL (on build.mysql.com, not on my machine; this is a question of milliseconds,
        if the slave server will process MASTER_POS_WAIT() before or after the slave SQL thread has stopped), and
        in mysqltest.c, sync_with_master complained that it could not sync.
        So I just remove this sync_with_master, which does not make sense anymore: we just wait for the slave SQL
        thread to stop.
      mysql-test/t/rpl_loaddata.test:
        Discovered we had wait_for_slave_to_stop, so used it as it automates things.
      mysql-test/t/rpl_master_pos_wait.test:
        Discovered we had 'send' to send a query without waiting for the resultn so could had a testcase for bug 651.
        Shorter timeouts as there is no risk the position is reached.
      sql/slave.cc:
        A longer DBUG_PRINT.
      366fd92e
  27. 03 Jun, 2003 1 commit
    • unknown's avatar
      -- Waiting for Monty's approval before push -- · ccb398b9
      unknown authored
      Bug 571: play LOAD DATA INFILE the same way on the slave as it was on the master: 
      if it was with IGNORE, do it with IGNORE,
      if it was with REPLACE, do it with REPLACE,
      and (the change) if it was with nothing, do it with nothing (not with IGNORE !!).
      Bug 573: print a proper error message in case of duplicate entry in LOAD DATA INFILE
      on the slave, i.e. a message where the keyname and key value appear :
      'Duplicate entry '1' for key 1' and not 'Duplicate entry '%-.64s' for key %d'
      
      
      mysql-test/r/rpl_loaddata.result:
        result update
      mysql-test/t/rpl_loaddata.test:
        check if duplicate entries on the slave trigger an error 
        when the slave replicates LOAD DATA INFILE (without IGNORE or REPLACE)
        (bug 571).
      sql/log_event.cc:
        Bug 571: play LOAD DATA INFILE the same way on the slave as it was on the master: 
        if it was with IGNORE, do it with IGNORE,
        if it was with REPLACE, do it with REPLACE,
        and (the change) if it was with nothing, do it with nothing (not with IGNORE !!).
        Bug 573: print a proper error message in case of duplicate entry in LOAD DATA INFILE
        on the slave, i.e. a message where the keyname and key value appear :
        'Duplicate entry '1' for key 1' and not 'Duplicate entry '%-.64s' for key %d'
      ccb398b9
  28. 21 May, 2003 1 commit
    • unknown's avatar
      fixed 'STARTING BY' in replication · 530accba
      unknown authored
      mysql-test/r/rpl_loaddata.result:
        added test for 'STARTING BY'
      mysql-test/std_data/rpl_loaddata2.dat:
        added test for 'STARTING BY'
      mysql-test/t/rpl_loaddata.test:
        added test for 'STARTING BY'
      sql/log_event.cc:
        fixed 'STARTING BY'
      530accba
  29. 20 May, 2003 1 commit
    • unknown's avatar
      changed processing of LOAD DATA in mysqlbinlog · 2ff9aee8
      unknown authored
      client/Makefile.am:
        added ../mysys/mf_tempdir.c to mysqlbinlog_SOURCES
      client/mysqlbinlog.cc:
        changed processing of LOAD DATA
      mysql-test/r/rpl_loaddata.result:
        added LINE STARTING BY '>'
      mysql-test/std_data/rpl_loaddata2.dat:
        added LINE STARTING BY '>'
      mysql-test/t/rpl_loaddata.test:
        added LINE STARTING BY '>'
      sql/log_event.cc:
        fixed some bugs in processing of LOAD DATA
      2ff9aee8
  30. 03 Apr, 2003 1 commit
  31. 18 Jan, 2003 1 commit
    • unknown's avatar
      Change client_flag to unsigned long (16 -> 32 bits) to handle more options. · 61434bf8
      unknown authored
      Don't use new password format if mysql.user has old format
      tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
      Portability fixes for Windows
      
      
      client/mysql.cc:
        Removed compiler warnings.
        Make quote handling simpler
      include/config-win.h:
        Fix for myisam/rt_mbr.c
      include/mysql.h:
        Change client_flag to unsigned long to handle more options.
      libmysql/libmysql.c:
        Change client_flag to unsigned long to handle more options.
      libmysqld/libmysqld.c:
        Change client_flag to unsigned long to handle more options.
      myisam/rt_mbr.c:
        Portability fix for Windows
      mysql-test/r/rpl_loaddata.result:
        Fix test case
      sql/item_strfunc.cc:
        Don't use new password format if mysql.user has old format
      sql/item_strfunc.h:
        Don't use new password format if mysql.user has old format
      sql/mysql_priv.h:
        Don't use new password format if mysql.user has old format
      sql/mysqld.cc:
        Don't use new password format if mysql.user has old format
      sql/sql_acl.cc:
        Don't use new password format if mysql.user has old format.
        tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
      sql/sql_class.h:
        Don't use new password format if mysql.user has old format
      sql/sql_parse.cc:
        Change client_flag to unsigned long to handle more options.
      sql/sql_yacc.yy:
        Don't use new password format if mysql.user has old format
      strings/ctype-utf8.c:
        Remove compiler warnings
      strings/ctype-win1250ch.c:
        Remove compiler warnings
      tests/grant.res:
        Update results
      61434bf8
  32. 14 Jan, 2003 1 commit
    • unknown's avatar
      Guard against compiling without -fno-exceptions · ef6c36c0
      unknown authored
      Allocate bigger default thread stack because of problems with glibc
      Fixed bug in UPDATE ... not_null_field=expression_that_returns_null
      Fixed bug in replication when using auto_increment and LOAD DATA INFILE
      
      
      include/my_global.h:
        Guard against compiling without -fno-exceptions
      include/my_pthread.h:
        Allocate bigger default thread stack because of problems with glibc
      mysql-test/r/null.result:
        Updated result
      mysql-test/t/null.test:
        Test of using UPDATE/INSERT with NULL on not null fields.
      sql/field_conv.cc:
        Fixed bug in UPDATE ... not_null_field=expression_that_returns_null
      sql/sql_load.cc:
        Fixed bug in replication when using auto_increment and LOAD DATA INFILE
      ef6c36c0
  33. 05 Jan, 2003 1 commit
    • unknown's avatar
      Changed mysql-test to print warnings for not existing table to DROP TABLE · 14810ff1
      unknown authored
      Cleaned up test; Removed wrong DROP TABLE commands and use standard table and database names.
      changed store_warning() -> push_warning_print()
      
      
      
      BitKeeper/deleted/.del-rpl000016-slave.opt~ef76f85ddcc13b87:
        Delete: mysql-test/t/rpl000016-slave.opt
      BitKeeper/deleted/.del-sel000001.test~9567c1646058cc:
        Delete: mysql-test/t/sel000001.test
      BitKeeper/deleted/.del-sel000002.test~9f500639572e18e1:
        Delete: mysql-test/t/sel000002.test
      BitKeeper/deleted/.del-sel000003.test~63a5512d18cd20a2:
        Delete: mysql-test/t/sel000003.test
      BitKeeper/deleted/.del-sel000001.result~383913ae4505ec86:
        Delete: mysql-test/r/sel000001.result
      BitKeeper/deleted/.del-sel000002.result~d1787e6fd5dbc1cc:
        Delete: mysql-test/r/sel000002.result
      BitKeeper/deleted/.del-sel000003.result~d7b657b1e3a286a7:
        Delete: mysql-test/r/sel000003.result
      BitKeeper/deleted/.del-sel000031.result~d49aeac63ad7db4d:
        Delete: mysql-test/r/sel000031.result
      BitKeeper/deleted/.del-sel000031.test~50a19a8e204e99bc:
        Delete: mysql-test/t/sel000031.test
      BitKeeper/deleted/.del-sel000032.result~6cb30e23cbca9fb0:
        Delete: mysql-test/r/sel000032.result
      BitKeeper/deleted/.del-sel000032.test~e32da7c3fc4b7ace:
        Delete: mysql-test/t/sel000032.test
      BitKeeper/deleted/.del-rpl000003.result~68d6ee00beaa011:
        Delete: mysql-test/r/rpl000003.result
      BitKeeper/deleted/.del-rpl000003.test~b7cfc4c5576fbafd:
        Delete: mysql-test/t/rpl000003.test
      client/mysql.cc:
        Don't yet print information about SQL help
      client/mysqltest.c:
        Added test options:
        --enable_warnings
        --disable_warnings
        --enable_info
        --disable_info
      configure.in:
        changed version number of shared libraries
      mysql-test/include/master-slave.inc:
        Don't write warnings on init
      mysql-test/r/backup.result:
        Updated results
      mysql-test/r/bdb.result:
        Updated results
      mysql-test/r/bigint.result:
        Updated results
      mysql-test/r/bool.result:
        Updated results
      mysql-test/r/create.result:
        Updated results
      mysql-test/r/delete.result:
        Updated results
      mysql-test/r/derived.result:
        Updated results
      mysql-test/r/distinct.result:
        Updated results
      mysql-test/r/drop.result:
        Updated results
      mysql-test/r/flush.result:
        Updated results
      mysql-test/r/fulltext.result:
        Updated results
      mysql-test/r/fulltext_multi.result:
        Updated results
      mysql-test/r/fulltext_order_by.result:
        Updated results
      mysql-test/r/func_equal.result:
        Updated results
      mysql-test/r/func_in.result:
        Updated results
      mysql-test/r/func_set.result:
        Updated results
      mysql-test/r/gcc296.result:
        Updated results
      mysql-test/r/group_by.result:
        Updated results
      mysql-test/r/innodb-deadlock.result:
        Updated results
      mysql-test/r/innodb.result:
        Updated results
      mysql-test/r/innodb_cache.result:
        Updated results
      mysql-test/r/innodb_handler.result:
        Updated results
      mysql-test/r/insert.result:
        Updated results
      mysql-test/r/insert_select.result:
        Updated results
      mysql-test/r/isam.result:
        Updated results
      mysql-test/r/join_outer.result:
        Updated results
      mysql-test/r/key.result:
        Updated results
      mysql-test/r/merge.result:
        Updated results
      mysql-test/r/multi_update.result:
        Updated results
      mysql-test/r/myisam.result:
        Updated results
      mysql-test/r/null.result:
        Updated results
      mysql-test/r/null_key.result:
        Updated results
      mysql-test/r/odbc.result:
        Updated results
      mysql-test/r/olap.result:
        Updated results
      mysql-test/r/order_by.result:
        Updated results
      mysql-test/r/query_cache.result:
        Updated results
      mysql-test/r/rename.result:
        Updated results
      mysql-test/r/row.result:
        Updated results
      mysql-test/r/rpl000001.result:
        Updated results
      mysql-test/r/rpl000002.result:
        Updated results
      mysql-test/r/rpl000004.result:
        Updated results
      mysql-test/r/rpl000005.result:
        Updated results
      mysql-test/r/rpl000006.result:
        Updated results
      mysql-test/r/rpl000008.result:
        Updated results
      mysql-test/r/rpl000009.result:
        Updated results
      mysql-test/r/rpl000010.result:
        Updated results
      mysql-test/r/rpl000011.result:
        Updated results
      mysql-test/r/rpl000012.result:
        Updated results
      mysql-test/r/rpl000013.result:
        Updated results
      mysql-test/r/rpl_alter.result:
        Updated results
      mysql-test/r/rpl_empty_master_crash.result:
        Updated results
      mysql-test/r/rpl_redirect.result:
        Updated results
      mysql-test/r/rpl_replicate_do.result:
        Updated results
      mysql-test/r/rpl_rotate_logs.result:
        Updated results
      mysql-test/r/rpl_skip_error.result:
        Updated results
      mysql-test/r/rpl_temporary.result:
        Updated results
      mysql-test/r/select.result:
        Updated results
      mysql-test/r/subselect.result:
        Updated results
      mysql-test/r/temp_table.result:
        Updated results
      mysql-test/r/type_date.result:
        Updated results
      mysql-test/r/type_float.result:
        Updated results
      mysql-test/r/union.result:
        Updated results
      mysql-test/r/update.result:
        Updated results
      mysql-test/r/user_var.result:
        Updated results
      mysql-test/r/varbinary.result:
        Updated results
      mysql-test/r/variables.result:
        Updated results
      mysql-test/r/warnings.result:
        Updated results
      mysql-test/t/alias.test:
        Don't write warnings when initializing test
      mysql-test/t/alter_table.test:
        Don't write warnings when initializing test
      mysql-test/t/analyse.test:
        Don't write warnings when initializing test
      mysql-test/t/auto_increment.test:
        Don't write warnings when initializing test
      mysql-test/t/backup.test:
        Don't write warnings when initializing test
      mysql-test/t/bdb-alter-table-1.test:
        Don't write warnings when initializing test
      mysql-test/t/bdb-crash.test:
        Don't write warnings when initializing test
      mysql-test/t/bdb-deadlock.test:
        Don't write warnings when initializing test
      mysql-test/t/bdb.test:
        Don't write warnings when initializing test
        cleaned up test
      mysql-test/t/bdb_cache.test:
        Don't write warnings when initializing test
      mysql-test/t/bench_count_distinct.test:
        Don't write warnings when initializing test
      mysql-test/t/bigint.test:
        Don't write warnings when initializing test
      mysql-test/t/binary.test:
        Don't write warnings when initializing test
      mysql-test/t/bool.test:
        Don't write warnings when initializing test
        Changed to use standard table names
      mysql-test/t/bulk_replace.test:
        Don't write warnings when initializing test
      mysql-test/t/case.test:
        Don't write warnings when initializing test
      mysql-test/t/check.test:
        Don't write warnings when initializing test
      mysql-test/t/compare.test:
        Don't write warnings when initializing test
      mysql-test/t/connect.test:
        Removed empty line
      mysql-test/t/constraints.test:
        Don't write warnings when initializing test
      mysql-test/t/count_distinct.test:
        Don't write warnings when initializing test
      mysql-test/t/count_distinct2.test:
        Don't write warnings when initializing test
      mysql-test/t/create.test:
        Don't write warnings when initializing test
        Cleaned up test
      mysql-test/t/ctype_latin1_de.test:
        Don't write warnings when initializing test
      mysql-test/t/ctype_many.test:
        Don't write warnings when initializing test
      mysql-test/t/delayed.test:
        Don't write warnings when initializing test
      mysql-test/t/delete.test:
        Don't write warnings when initializing test
        Cleaned up test
      mysql-test/t/derived.test:
        Don't write warnings when initializing test
        Cleaned up test
      mysql-test/t/dirty_close.test:
        Don't write warnings when initializing test
      mysql-test/t/distinct.test:
        Don't write warnings when initializing test
        Cleaned up test
      mysql-test/t/drop.test:
        Don't write warnings when initializing test
      mysql-test/t/empty_table.test:
        Don't write warnings when initializing test
      mysql-test/t/err000001.test:
        Don't write warnings when initializing test
        Cleaned up test
      mysql-test/t/explain.test:
        Don't write warnings when initializing test
      mysql-test/t/flush.test:
        Don't write warnings when initializing test
      mysql-test/t/foreign_key.test:
        Don't write warnings when initializing test
      mysql-test/t/fulltext.test:
        Don't write warnings when initializing test
      mysql-test/t/fulltext_cache.test:
        Don't write warnings when initializing test
      mysql-test/t/fulltext_distinct.test:
        Don't write warnings when initializing test
      mysql-test/t/fulltext_left_join.test:
        Don't write warnings when initializing test
      mysql-test/t/fulltext_multi.test:
        Don't write warnings when initializing test
      mysql-test/t/fulltext_order_by.test:
        Don't write warnings when initializing test
      mysql-test/t/fulltext_update.test:
        Don't write warnings when initializing test
      mysql-test/t/func_concat.test:
        Don't write warnings when initializing test
      mysql-test/t/func_date_add.test:
        Don't write warnings when initializing test
      mysql-test/t/func_encrypt.test:
        Don't write warnings when initializing test
      mysql-test/t/func_equal.test:
        Don't write warnings when initializing test
      mysql-test/t/func_group.test:
        Don't write warnings when initializing test
      mysql-test/t/func_if.test:
        Don't write warnings when initializing test
      mysql-test/t/func_in.test:
        Don't write warnings when initializing test
      mysql-test/t/func_isnull.test:
        Don't write warnings when initializing test
      mysql-test/t/func_like.test:
        Don't write warnings when initializing test
      mysql-test/t/func_regexp.test:
        Don't write warnings when initializing test
      mysql-test/t/func_set.test:
        Don't write warnings when initializing test
        Merged test with other tests
      mysql-test/t/func_str.test:
        Don't write warnings when initializing test
      mysql-test/t/func_time.test:
        Don't write warnings when initializing test
      mysql-test/t/func_timestamp.test:
        Don't write warnings when initializing test
      mysql-test/t/gcc296.test:
        Don't write warnings when initializing test
        Cleaned up test
      mysql-test/t/grant_cache.test:
        Don't write warnings when initializing test
      mysql-test/t/group_by.test:
        Don't write warnings when initializing test
        Cleaned up test
      mysql-test/t/handler.test:
        Don't write warnings when initializing test
      mysql-test/t/having.test:
        Don't write warnings when initializing test
      mysql-test/t/heap.test:
        Don't write warnings when initializing test
      mysql-test/t/heap_auto_increment.test:
        Don't write warnings when initializing test
      mysql-test/t/heap_btree.test:
        Don't write warnings when initializing test
      mysql-test/t/heap_hash.test:
        Don't write warnings when initializing test
      mysql-test/t/innodb-deadlock.test:
        Don't write warnings when initializing test
      mysql-test/t/innodb.test:
        Don't write warnings when initializing test
      mysql-test/t/innodb_cache.test:
        Don't write warnings when initializing test
      mysql-test/t/innodb_handler.test:
        Don't write warnings when initializing test
      mysql-test/t/ins000001.test:
        Don't write warnings when initializing test
      mysql-test/t/insert.test:
        Don't write warnings when initializing test
        cleaned up test.
        Changed to use standard database and table names
      mysql-test/t/insert_select.test:
        Don't write warnings when initializing test
        Changed to use standard table names
      mysql-test/t/insert_update.test:
        Don't write warnings when initializing test
      mysql-test/t/isam.test:
        Don't write warnings when initializing test
        cleaned up test
      mysql-test/t/join.test:
        Don't write warnings when initializing test
      mysql-test/t/join_crash.test:
        Don't write warnings when initializing test
      mysql-test/t/join_outer.test:
        Don't write warnings when initializing test
      mysql-test/t/key.test:
        Don't write warnings when initializing test
      mysql-test/t/key_diff.test:
        Don't write warnings when initializing test
      mysql-test/t/key_primary.test:
        Don't write warnings when initializing test
      mysql-test/t/keywords.test:
        Don't write warnings when initializing test
      mysql-test/t/kill.test:
        Don't write warnings when initializing test
      mysql-test/t/limit.test:
        Don't write warnings when initializing test
      mysql-test/t/lock.test:
        Don't write warnings when initializing test
      mysql-test/t/lock_multi.test:
        Don't write warnings when initializing test
      mysql-test/t/lowercase_table.test:
        Don't write warnings when initializing test
      mysql-test/t/merge.test:
        Don't write warnings when initializing test
        cleaned up test
      mysql-test/t/multi_update.test:
        Don't write warnings when initializing test
      mysql-test/t/myisam.test:
        Don't write warnings when initializing test
      mysql-test/t/null.test:
        Don't write warnings when initializing test
      mysql-test/t/null_key.test:
        Don't write warnings when initializing test
      mysql-test/t/odbc.test:
        Don't write warnings when initializing test
      mysql-test/t/olap.test:
        Don't write warnings when initializing test
      mysql-test/t/order_by.test:
        Don't write warnings when initializing test
      mysql-test/t/order_fill_sortbuf.test:
        Don't write warnings when initializing test
      mysql-test/t/query_cache.test:
        Don't write warnings when initializing test
      mysql-test/t/raid.test:
        Don't write warnings when initializing test
      mysql-test/t/range.test:
        Don't write warnings when initializing test
      mysql-test/t/rename.test:
        Don't write warnings when initializing test
      mysql-test/t/repair.test:
        Don't write warnings when initializing test
      mysql-test/t/replace.test:
        Don't write warnings when initializing test
      mysql-test/t/rollback.test:
        Don't write warnings when initializing test
      mysql-test/t/row.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000001.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000002.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000004.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000005.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000006.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000008-slave.opt:
        Don't write warnings when initializing test
      mysql-test/t/rpl000008.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000009-slave.opt:
        Don't write warnings when initializing test
      mysql-test/t/rpl000009.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000010.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000011.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000012.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000013.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000015.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000017.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000018.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl_alter.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl_empty_master_crash.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl_redirect.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl_replicate_do.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl_rotate_logs.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl_skip_error.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl_temporary.test:
        Don't write warnings when initializing test
      mysql-test/t/sel000033.test:
        Don't write warnings when initializing test
      mysql-test/t/sel000100.test:
        Don't write warnings when initializing test
      mysql-test/t/select.test:
        Don't write warnings when initializing test
      mysql-test/t/select_found.test:
        Don't write warnings when initializing test
      mysql-test/t/select_safe.test:
        Don't write warnings when initializing test
      mysql-test/t/show_check.test:
        Don't write warnings when initializing test
      mysql-test/t/status.test:
        Don't write warnings when initializing test
      mysql-test/t/subselect.test:
        Don't write warnings when initializing test
      mysql-test/t/symlink.test:
        Don't write warnings when initializing test
      mysql-test/t/tablelock.test:
        Don't write warnings when initializing test
      mysql-test/t/temp_table.test:
        Don't write warnings when initializing test
      mysql-test/t/truncate.test:
        Don't write warnings when initializing test
      mysql-test/t/type_blob.test:
        Don't write warnings when initializing test
      mysql-test/t/type_date.test:
        Don't write warnings when initializing test
      mysql-test/t/type_datetime.test:
        Don't write warnings when initializing test
      mysql-test/t/type_decimal.test:
        Don't write warnings when initializing test
      mysql-test/t/type_enum.test:
        Don't write warnings when initializing test
      mysql-test/t/type_float.test:
        Don't write warnings when initializing test
      mysql-test/t/type_ranges.test:
        Don't write warnings when initializing test
      mysql-test/t/type_set.test:
        Don't write warnings when initializing test
      mysql-test/t/type_time.test:
        Don't write warnings when initializing test
      mysql-test/t/type_timestamp.test:
        Don't write warnings when initializing test
      mysql-test/t/type_uint.test:
        Don't write warnings when initializing test
      mysql-test/t/type_year.test:
        Don't write warnings when initializing test
      mysql-test/t/union.test:
        Don't write warnings when initializing test
      mysql-test/t/update.test:
        Don't write warnings when initializing test
      mysql-test/t/user_var.test:
        Don't write warnings when initializing test
      mysql-test/t/varbinary.test:
        Don't write warnings when initializing test
      mysql-test/t/variables.test:
        Don't write warnings when initializing test
      mysql-test/t/warnings.test:
        Don't write warnings when initializing test
      mysys/my_vsnprintf.c:
        Safety fix
      readline/terminal.c:
        Removed compiler warnings
      sql/ha_berkeley.cc:
        Indentation changes
      sql/mysql_priv.h:
        Change store_warning -> push_warning_printf
      sql/sql_db.cc:
        Change store_warning -> push_warning_printf
      sql/sql_error.cc:
        Change store_warning -> push_warning_printf
      sql/sql_table.cc:
        Change store_warning -> push_warning_printf
      14810ff1
  34. 24 Oct, 2002 1 commit
  35. 08 Aug, 2002 1 commit
    • unknown's avatar
      Lots of code fixes to the replication code (especially the binary logging and... · f01f4991
      unknown authored
      Lots of code fixes to the replication code (especially the binary logging and index log file handling)
      Fixed bugs in my last changeset that made MySQL hard to compile.
      Added mutex around some data that could cause table cache corruptions when using OPTIMIZE TABLE / REPAIR TABLE or automatic repair of MyISAM tables.
      Added mutex around some data in the slave start/stop code that could cause THD linked list corruptions
      Extended my_chsize() to allow one to specify a filler character.
      Extend vio_blocking to return the old state (This made some usage of this function much simpler)
      Added testing for some functions that they caller have got the required mutexes before calling the function.
      Use setrlimit() to ensure that we can write core file if one specifies --core-file.
      Added --slave-compressed-protocol
      Made 2 the minimum length for ft_min_word_len
      Added variables foreign_key_checks & unique_checks.
      Less logging from replication code (if not started with --log-warnings)
      Changed that SHOW INNODB STATUS requre the SUPER privilege
      More DBUG statements and a lot of new code comments
      
      
      BitKeeper/deleted/.del-rpl_compat.result~c950bc346b12c61a:
        Delete: mysql-test/r/rpl_compat.result
      BitKeeper/deleted/.del-rpl_compat.test~5f6ba955e02aa95f:
        Delete: mysql-test/t/rpl_compat.test
      Docs/manual.texi:
        Updated manual with fixes in this changeset
      client/mysqltest.c:
        Indentation cleanup
        Better error messages for some error conditions.
      include/my_pthread.h:
        Added 'safe_mutex_assert_owner()' to check that the thread really owns the mutex.
      include/my_sys.h:
        Extended my_chsize() to allow one to specify a filler character.
        (For MySQL index logs)
      include/raid.h:
        New my_chsize()
      include/violite.h:
        Extend vio_blocking to return the old state
      innobase/include/dyn0dyn.h:
        Merge with 3.23 (AIX DYN_ARRAY_DATA_SIZE)
      innobase/include/dyn0dyn.ic:
        Merge with 3.23
      isam/create.c:
        Fix for new my_chsize()
      isam/isamchk.c:
        Fix for new my_chsize()
      isam/pack_isam.c:
        Fix for new my_chsize()
      libmysql/manager.c:
        Fix for new vio_blocking()
      libmysqld/lib_sql.cc:
        Fix for new open_log()
      myisam/mi_cache.c:
        Fix typo from previous checking
      myisam/mi_check.c:
        Fix for new my_chsize()
      myisam/mi_create.c:
        Fix for new my_chsize()
      myisam/mi_delete_all.c:
        Fix for new my_chsize()
      myisam/myisampack.c:
        Fix for new my_chsize()
      mysql-test/include/master-slave.inc:
        Better initialization for replication tests
      mysql-test/mysql-test-run.sh:
        Added option --log-warnings
      mysql-test/r/insert.result:
        More tests if INSERT ...(DEFAULT)
      mysql-test/r/rpl000001.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000002.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000003.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000004.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000005.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000006.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000007.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000008.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000009.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000010.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000011.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000012.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000013.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000014.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl_alter.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl_empty_master_crash.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl_get_lock.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl_log.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl_magic.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl_mystery22.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl_skip_error.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl_sporadic_master.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/insert.test:
        More tests if INSERT ...(DEFAULT)
      mysql-test/t/rpl000001.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000002.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000003.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000004.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000005.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000006.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000007.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000009.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000011.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000013.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000014.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl_alter.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl_empty_master_crash.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl_get_lock.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl_magic.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl_mystery22.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl_skip_error.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl_sporadic_master.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysys/mf_iocache.c:
        More debug info
        Force seek after reinit_io_cache()
      mysys/mf_iocache2.c:
        Added my_b_filelength()
      mysys/my_chsize.c:
        Extended my_chsize() to allow one to specify a filler character.
        (For MySQL index logs)
      mysys/raid.cc:
        Extended my_chsize() to allow one to specify a filler character.
        (For MySQL index logs)
      sql/field.h:
        Fix for INSERT ... (DEFAULT)
      sql/ha_berkeley.h:
        Fix for dynamic variables
      sql/ha_innodb.cc:
        Change sprintf() to my_sprintf() to make code portable.
        Fix after sync with 3.23
        (We still need to fix the storage of the replication position in innodb)
      sql/ha_innodb.h:
        Fix for dynamic variables
      sql/handler.cc:
        Remove writting of COMMIT to the binary log.
        (Now done in MYSQL_LOG::write())
      sql/item_func.cc:
        Query_log_event() now always takes query length.
      sql/item_func.h:
        Indentation cleanup
      sql/item_strfunc.h:
        Indentation cleanup
      sql/item_timefunc.h:
        Indentation cleanup
      sql/lock.cc:
        Check that we own critical mutexes.
      sql/log.cc:
        Big code cleanup / rewrite / optimize.
        - The index log file has its own IO_CACHE object.
        - Many functions totally rewritten to make them smaller and faster.
        - New handling of index log files
        - Lots of new comments
      sql/log_event.cc:
        Code cleanup
        New comments
      sql/log_event.h:
        Query_log_event() now always takes query length.
      sql/mini_client.cc:
        Better error messages on reconnect.
        Fixed wrong variable usage from last commit.
      sql/mysql_priv.h:
        New arguments to open_log()
      sql/mysqld.cc:
        Use setrlimit() to ensure that we can write core file if one specifies --core-file
        Added index file name as parameter to openlog().
        Added --slave-compressed-protocol
        Made 2 the minimum length for ft_min_word_len
      sql/net_serv.cc:
        Use new vio_blocking()
        (The vio_blocking() change was done to make this code more readable)
      sql/repl_failsafe.cc:
        Minor code cleanup
      sql/set_var.cc:
        Added variables slave_compressed_protocol, foreign_key_checks & unique_checks.
      sql/set_var.h:
        Generalization
      sql/slave.cc:
        Code cleanup & rewrite.
        Dont call SELECT VERSION() on check_master_version()
        New init_slave() code.
        Ensure that all threads create a THD early.
        Add locks around manipulation of critical structures
        Don't retry a command more than master_retry_count times.
        Write less warnings to the log file (if not started with --log-warnings)
        Faster flush_relay_log_info()
      sql/slave.h:
        More comments
        Added new arguments to some functions.
      sql/sql_acl.cc:
        More DBUG info
        New parameter to Query_log_event()
      sql/sql_base.cc:
        Added some mutex checking.
      sql/sql_cache.cc:
        Less not critical debug info
      sql/sql_class.h:
        Fix for new log handling.
      sql/sql_db.cc:
        Added mutex around remove_db_from_cache()
      sql/sql_delete.cc:
        Added missing parameters to changed functions
      sql/sql_insert.cc:
        Added missing parameters to changed functions
      sql/sql_parse.cc:
        Do an 'end_active_trans()' before 'load_master_data'
        Changed that SHOW INNODB STATUS requre the SUPER privilege
        Added new function parameters to new functions
      sql/sql_rename.cc:
        Added missing parameters to changed functions
      sql/sql_repl.cc:
        Code cleanups / new comments
        Fix for new find_first_log() calling standard.
        More DBUG statements.
        Show binlogs updated to use new IO_CACHE:d index log file.
      sql/sql_repl.h:
        New function arguments
      sql/sql_select.cc:
        Indentation changes
      sql/sql_table.cc:
        Added missing parameters to changed functions
        Added checking of mutex
        Added mutex around critical regions.
      sql/sql_test.cc:
        Don't use THR_ALARM if the configuration doesn't support it.
      sql/sql_update.cc:
        Added missing parameters to changed functions
      sql/table.cc:
        Added missing parameters to changed functions
      vio/vio.c:
        Extend vio_blocking to return the old state
      vio/viosocket.c:
        Extend vio_blocking to return the old state
      vio/viossl.c:
        Extend vio_blocking to return the old state
      f01f4991
  36. 28 Sep, 2001 1 commit
    • unknown's avatar
      client/mysqlmanagerc.c · 29f148bd
      unknown authored
          added support for quiet
          increased line buffer size
      client/mysqltest.c
          fixed memory leak
          added query logging to result file
          added error message logging to result file
          added enable_query_log/disable_query_log
      mysql-test/mysql-test-run.sh
          converted tests to use mysqlmanager
      
      Updated test results
      
      
      BitKeeper/etc/ignore:
        added *.reject
      client/mysqlmanagerc.c:
        added support for quiet
        increased line buffer size
      client/mysqltest.c:
        fixed memory leak
        added query logging to result file
        added error message logging to result file
        added enable_query_log/disable_query_log
      mysql-test/mysql-test-run.sh:
        converted tests to use mysqlmanager
      mysql-test/r/alias.result:
        log queries
      mysql-test/r/alter_table.result:
        log queries
      mysql-test/r/analyse.result:
        log queries
      mysql-test/r/auto_increment.result:
        log queries
      mysql-test/r/backup.result:
        log queries
      mysql-test/r/bdb-crash.result:
        log queries
      mysql-test/r/bench_count_distinct.result:
        log queries
      mysql-test/r/bigint.result:
        log queries
      mysql-test/r/binary.result:
        log queries
      mysql-test/r/bulk_replace.result:
        log queries
      mysql-test/r/case.result:
        log queries
      mysql-test/r/check.result:
        log queries
      mysql-test/r/comments.result:
        log queries
      mysql-test/r/compare.result:
        log queries
      mysql-test/r/count_distinct.result:
        log queries
      mysql-test/r/count_distinct2.result:
        log queries
      mysql-test/r/create.result:
        log queries
      mysql-test/r/ctype_latin1_de.result:
        log queries
      mysql-test/r/delayed.result:
        log queries
      mysql-test/r/dirty-close.result:
        log queries
      mysql-test/r/distinct.result:
        log queries
      mysql-test/r/drop.result:
        log queries
      mysql-test/r/empty_table.result:
        log queries
      mysql-test/r/explain.result:
        log queries
      mysql-test/r/flush.result:
        log queries
      mysql-test/r/fulltext.result:
        log queries
      mysql-test/r/fulltext_cache.result:
        log queries
      mysql-test/r/fulltext_distinct.result:
        log queries
      mysql-test/r/fulltext_left_join.result:
        log queries
      mysql-test/r/fulltext_multi.result:
        log queries
      mysql-test/r/fulltext_order_by.result:
        log queries
      mysql-test/r/fulltext_update.result:
        log queries
      mysql-test/r/fulltext_var.result:
        log queries
      mysql-test/r/func_crypt.result:
        log queries
      mysql-test/r/func_date_add.result:
        log queries
      mysql-test/r/func_equal.result:
        log queries
      mysql-test/r/func_group.result:
        log queries
      mysql-test/r/func_in.result:
        log queries
      mysql-test/r/func_like.result:
        log queries
      mysql-test/r/func_math.result:
        log queries
      mysql-test/r/func_misc.result:
        log queries
      mysql-test/r/func_op.result:
        log queries
      mysql-test/r/func_regexp.result:
        log queries
      mysql-test/r/func_set.result:
        log queries
      mysql-test/r/func_str.result:
        log queries
      mysql-test/r/func_system.result:
        log queries
      mysql-test/r/func_test.result:
        log queries
      mysql-test/r/func_time.result:
        log queries
      mysql-test/r/func_timestamp.result:
        log queries
      mysql-test/r/group_by.result:
        log queries
      mysql-test/r/handler.result:
        log queries
      mysql-test/r/having.result:
        log queries
      mysql-test/r/heap.result:
        log queries
      mysql-test/r/identity.result:
        log queries
      mysql-test/r/ins000001.result:
        log queries
      mysql-test/r/insert.result:
        log queries
      mysql-test/r/insert_select.result:
        log queries
      mysql-test/r/isam.result:
        log queries
      mysql-test/r/join.result:
        log queries
      mysql-test/r/join_crash.result:
        log queries
      mysql-test/r/join_outer.result:
        log queries
      mysql-test/r/key.result:
        log queries
      mysql-test/r/key_diff.result:
        log queries
      mysql-test/r/key_primary.result:
        log queries
      mysql-test/r/keywords.result:
        log queries
      mysql-test/r/kill.result:
        log queries
      mysql-test/r/limit.result:
        log queries
      mysql-test/r/lock.result:
        log queries
      mysql-test/r/merge.result:
        log queries
      mysql-test/r/multi_update.result:
        log queries
      mysql-test/r/myisam.result:
        log queries
      mysql-test/r/null.result:
        log queries
      mysql-test/r/null_key.result:
        log queries
      mysql-test/r/odbc.result:
        log queries
      mysql-test/r/openssl_1.result:
        log queries
      mysql-test/r/openssl_2.result:
        log queries
      mysql-test/r/order_by.result:
        log queries
      mysql-test/r/order_fill_sortbuf.result:
        log queries
      mysql-test/r/raid.result:
        log queries
      mysql-test/r/range.result:
        log queries
      mysql-test/r/rename.result:
        log queries
      mysql-test/r/replace.result:
        log queries
      mysql-test/r/rollback.result:
        log queries
      mysql-test/r/rpl000001.result:
        log queries
      mysql-test/r/rpl000002.result:
        log queries
      mysql-test/r/rpl000003.result:
        log queries
      mysql-test/r/rpl000004.result:
        log queries
      mysql-test/r/rpl000005.result:
        log queries
      mysql-test/r/rpl000006.result:
        log queries
      mysql-test/r/rpl000007.result:
        log queries
      mysql-test/r/rpl000008.result:
        log queries
      mysql-test/r/rpl000009.result:
        log queries
      mysql-test/r/rpl000010.result:
        log queries
      mysql-test/r/rpl000011.result:
        log queries
      mysql-test/r/rpl000012.result:
        log queries
      mysql-test/r/rpl000013.result:
        log queries
      mysql-test/r/rpl000014.result:
        log queries
      mysql-test/r/rpl000015.result:
        log queries
      mysql-test/r/rpl000016.result:
        log queries
      mysql-test/r/rpl000017.result:
        log queries
      mysql-test/r/rpl000018.result:
        log queries
      mysql-test/r/rpl_get_lock.result:
        log queries
      mysql-test/r/rpl_log.result:
        log queries
      mysql-test/r/rpl_magic.result:
        log queries
      mysql-test/r/rpl_mystery22.result:
        log queries
      mysql-test/r/rpl_sporadic_master.result:
        log queries
      mysql-test/r/sel000001.result:
        log queries
      mysql-test/r/sel000002.result:
        log queries
      mysql-test/r/sel000003.result:
        log queries
      mysql-test/r/sel000031.result:
        log queries
      mysql-test/r/sel000032.result:
        log queries
      mysql-test/r/sel000033.result:
        log queries
      mysql-test/r/sel000100.result:
        log queries
      mysql-test/r/select.result:
        log queries
      mysql-test/r/select_found.result:
        log queries
      mysql-test/r/select_safe.result:
        log queries
      mysql-test/r/show_check.result:
        log queries
      mysql-test/r/slave-running.result:
        log queries
      mysql-test/r/slave-stopped.result:
        log queries
      mysql-test/r/status.result:
        log queries
      mysql-test/r/symlink.result:
        log queries
      mysql-test/r/tablelock.result:
        log queries
      mysql-test/r/temp_table.result:
        log queries
      mysql-test/r/truncate.result:
        log queries
      mysql-test/r/type_blob.result:
        log queries
      mysql-test/r/type_date.result:
        log queries
      mysql-test/r/type_datetime.result:
        log queries
      mysql-test/r/type_decimal.result:
        log queries
      mysql-test/r/type_enum.result:
        log queries
      mysql-test/r/type_float.result:
        log queries
      mysql-test/r/type_ranges.result:
        log queries
      mysql-test/r/type_time.result:
        log queries
      mysql-test/r/type_timestamp.result:
        log queries
      mysql-test/r/type_uint.result:
        log queries
      mysql-test/r/type_year.result:
        log queries
      mysql-test/r/union.result:
        log queries
      mysql-test/r/update.result:
        log queries
      mysql-test/r/user_var.result:
        log queries
      mysql-test/r/varbinary.result:
        log queries
      mysql-test/r/variables.result:
        log queries
      mysql-test/t/bench_count_distinct.test:
        log queries
      mysql-test/t/check.test:
        log queries
      mysql-test/t/count_distinct2.test:
        log queries
      mysql-test/t/flush.test:
        log queries
      mysql-test/t/isam.test:
        log queries
      mysql-test/t/multi_update.test:
        log queries
      mysql-test/t/myisam.test:
        log queries
      mysql-test/t/order_fill_sortbuf.test:
        log queries
      mysql-test/t/rpl000016.test:
        log queries
      tools/managertest1.nc:
        test for def_exec overwrite
      tools/mysqlmanager.c:
        support def_exec overwrite and queries on running server
      29f148bd