An error occurred fetching the project authors.
  1. 31 May, 2007 1 commit
    • unknown's avatar
      some test cases cannot run with --skip-log-bin · c063a677
      unknown authored
      mysql-test/r/mix_innodb_myisam_binlog.result:
        have_log_bin.inc increases transaction count by onw
      mysql-test/t/binlog.test:
        test obviously requires binlog
      mysql-test/t/blackhole.test:
        test requires binlog for now
      mysql-test/t/ctype_cp932_binlog.test:
        test requires binlog
      mysql-test/t/ctype_cp932_notembedded.test:
        test requires binlog for now
      mysql-test/t/ctype_ucs_binlog.test:
        test requires binlog
      mysql-test/t/drop_temp_table.test:
        test requires binlog for now
      mysql-test/t/flush_block_commit_notembedded.test:
        test requires binlog for now
      mysql-test/t/insert_select-binlog.test:
        test requires binlog
      mysql-test/t/mix_innodb_myisam_binlog.test:
        test requires binlog
      mysql-test/t/mysqlbinlog-cp932.test:
        test requires binlog
      mysql-test/t/mysqlbinlog.test:
        test requires binlog
      mysql-test/t/mysqlbinlog2.test:
        test requires binlog
      mysql-test/t/mysqltest.test:
        test requires binlog for now
      mysql-test/t/sp_trans.test:
        test requires binlog for now
      mysql-test/t/user_var-binlog.test:
        test requires binlog for now
      c063a677
  2. 31 Mar, 2007 2 commits
    • unknown's avatar
      Add correct replace · 407389ba
      unknown authored
      407389ba
    • unknown's avatar
      Bug#27049 Race condition in test mysqlbinlog.test · ff979b76
      unknown authored
       - Add --local-load option to avoidthat the load data file requested
         by mysqlbinlog end up in local var/tmp dir and not in system global
         tmpdir
      
      
      mysql-test/t/mysqlbinlog.test:
        Add --local-load option to avoidthat the load data file requested
        by mysqlbinlog end up in local var/tmp dir and not in system global
        tmpdir
      ff979b76
  3. 01 Mar, 2007 3 commits
  4. 28 Feb, 2007 2 commits
    • unknown's avatar
      After merge fix · 18f1d1a2
      unknown authored
      18f1d1a2
    • unknown's avatar
      Bug#15126 character_set_database is not replicated (LOAD DATA INFILE need it) · c3a3aff5
      unknown authored
      This patch fixes problem that LOAD DATA could use different
      character sets when loading files on master and on slave sides:
      - Adding replication of thd->variables.collation_database
      - Adding optional character set clause into LOAD DATA
      
      Note, the second way, with explicit CHARACTER SET clause
      should be the recommended way to load data using an alternative
      character set.
      The old way, using "SET @@character_set_database=xxx" should be
      gradually depricated.
      
      
      mysql-test/r/mysqlbinlog.result:
        Adding test case
      mysql-test/t/mysqlbinlog.test:
        Adding test case
      sql/log_event.cc:
        Adding logging of thd->variables.collation_database
      sql/log_event.h:
        Adding declarations
      sql/sql_class.cc:
        Exchange character set is null by default
      sql/sql_class.h:
        Adding character set into sql_exchange
      sql/sql_load.cc:
        - Using exchange character set (if it was specified in LOAD DATA syntax)
        - Using thd->variables.collation_database by default
      sql/sql_yacc.yy:
        Adding optional character set clause into LOAD DATA syntax
      mysql-test/r/rpl_loaddata2.result:
        New BitKeeper file ``mysql-test/r/rpl_loaddata2.result''
      mysql-test/std_data/loaddata6.dat:
        New BitKeeper file ``mysql-test/std_data/loaddata6.dat''
      mysql-test/t/rpl_loaddata2.test:
        New BitKeeper file ``mysql-test/t/rpl_loaddata2.test''
      c3a3aff5
  5. 20 Feb, 2007 1 commit
  6. 19 Feb, 2007 2 commits
    • unknown's avatar
      2b46c20a
    • unknown's avatar
      Bug#18743: Several test cases fails if "classic" configuration in 5.0 · db36a2aa
      unknown authored
      The problem happened because those tests were using "cp932" and "ucs2" without checking whether these character sets are available. This fix moves test parts to make character set specific parts be tested only if they are:
      - some parts were moved to "ctype_ucs.test" and "ctype_cp932.test"
      - some parts were moved to the newly added tests "innodb-ucs2.test", "mysqlbinglog-cp932.test" and "sp-ucs2.test"
      
      
      mysql-test/r/ctype_cp932.result:
        Moved cp932-specific test case from mysql.test
      mysql-test/r/innodb.result:
        Moved ucs2-specific test cases to innodb-ucs2.test
      mysql-test/r/mysql.result:
        Move cp932-specific test cases to ctype_cp932.test
      mysql-test/r/mysqlbinlog.result:
        Moved cp932-specific test case to mysqlbinlog-cp932.test
      mysql-test/r/sp.result:
        Moved ucs2-specific test case to sp-ucs2.test
      mysql-test/t/ctype_cp932.test:
        Moved cp932-specific test case from mysql.test
      mysql-test/t/ctype_ucs2_def-master.opt:
        Use the comma-separated list of character sets to avoid mysql-test errors when ucs2 is not available in the server
      mysql-test/t/ctype_ucs2_def.test:
        Added requirement for ucs2 in the server
      mysql-test/t/innodb.test:
        Moved ucs2-specific test cases to innodb-ucs2.test
      mysql-test/t/mysql.test:
        Move cp932-specific test cases to ctype_cp932.test
      mysql-test/t/mysqlbinlog.test:
        Moved cp932-specific test case to mysqlbinlog-cp932.test
      mysql-test/t/sp.test:
        Moved ucs2-specific test case to sp-ucs2.test
      sql/mysqld.cc:
        Allow specifying several character sets for test purposes, to make "mysqld" start even if the character set being tested is not compiled:
        mysqld --default-character-set=ucs2,latin1
        The first available character set will be chosen.
      mysql-test/r/innodb-ucs2.result:
        New BitKeeper file ``mysql-test/r/innodb-ucs2.result''
      mysql-test/r/mysqlbinlog-cp932.result:
        New BitKeeper file ``mysql-test/r/mysqlbinlog-cp932.result''
      mysql-test/r/sp-ucs2.result:
        New BitKeeper file ``mysql-test/r/sp-ucs2.result''
      mysql-test/t/innodb-ucs2.test:
        New BitKeeper file ``mysql-test/t/innodb-ucs2.test''
      mysql-test/t/mysqlbinlog-cp932.test:
        New BitKeeper file ``mysql-test/t/mysqlbinlog-cp932.test''
      mysql-test/t/sp-ucs2.test:
        New BitKeeper file ``mysql-test/t/sp-ucs2.test''
      db36a2aa
  7. 22 Jan, 2007 1 commit
    • unknown's avatar
      Fixed compiler warnings · ea65c36c
      unknown authored
      Fixed wrong merge that disabled 'make test'
      Renamed all suppress files to end in '.supp'
      Don't give "skipped %d bytes from file" warnings in 5.0
      
      
      mysql-test/purify.supp:
        Rename: mysql-test/suppress.purify -> mysql-test/purify.supp
      support-files/compiler_warnings.supp:
        Rename: support-files/disabled_compiler_warnings.txt -> support-files/compiler_warnings.supp
      Makefile.am:
        Added back missing cd from wrong merge
      heap/hp_write.c:
        Fixed compiler warning
      mysql-test/r/mysqlbinlog.result:
        Fixed test case to drop all used tables at start and used tables after each test group
      mysql-test/t/mysqlbinlog.test:
        Fixed test case to drop all used tables at start and used tables after each test group
      sql/net_serv.cc:
        Don't give "skipped %d bytes from file" warnings in 5.0
        (The proper fix for this is in 5.1)
      sql/table.cc:
        Fixed compiler warning
      ea65c36c
  8. 14 Dec, 2006 2 commits
    • unknown's avatar
      Fixed compiler warnings detected by option -Wshadow and -Wunused: · f00257dd
      unknown authored
      - Removed not used variables and functions
      - Added #ifdef around code that is not used
      - Renamed variables and functions to avoid conflicts
      - Removed some not used arguments
      
      Fixed some class/struct warnings in ndb
      Added define IS_LONGDATA() to simplify code in libmysql.c
      
      I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
      
      
      BUILD/SETUP.sh:
        Added printing of unused functions and variables.
        Made it easy to test compiling with -Wshadow
      BUILD/compile-pentium-gcov:
        Added warnings
        Mark binary with -gcov
      client/mysql.cc:
        Fixed warnings found with gcc -Wshadow
      client/mysql_upgrade.c:
        Fixed warnings found with gcc -Wshadow
      client/mysqlbinlog.cc:
        Fixed warnings found with gcc -Wshadow
      client/mysqldump.c:
        Fixed warnings found with gcc -Wshadow
      client/mysqltest.c:
        Fixed warnings found with gcc -Wshadow
      client/sql_string.cc:
        Fixed warnings found with gcc -Wshadow
        Merged with sql/sql_string.cc
      client/sql_string.h:
        Fixed warnings found with gcc -Wshadow
        Merged with sql/sql_string.h
      cmd-line-utils/readline/display.c:
        Fixed compiler warning
      cmd-line-utils/readline/histexpand.c:
        Fixed warnings found with gcc -Wshadow
      cmd-line-utils/readline/input.c:
        Fixed warnings found with gcc -Wshadow
      cmd-line-utils/readline/text.c:
        Fixed warnings found with gcc -Wshadow
      cmd-line-utils/readline/vi_mode.c:
        Fixed warnings found with gcc -Wshadow
      dbug/dbug_analyze.c:
        Fixed warnings found with gcc -Wshadow
      extra/my_print_defaults.c:
        Prefixed defaults_extra_file and defaults_group_suffix with 'my' to avoid conflicts with similar named local variables
      extra/yassl/include/buffer.hpp:
        Fixed compiler warnings
      extra/yassl/include/crypto_wrapper.hpp:
        Fixed compiler warnings
      extra/yassl/include/yassl_imp.hpp:
        Fixed compiler warnings
      extra/yassl/include/yassl_int.hpp:
        Fixed compiler warnings
      extra/yassl/src/crypto_wrapper.cpp:
        Fixed compiler warnings
      extra/yassl/taocrypt/benchmark/benchmark.cpp:
        Fixed warnings found with gcc -Wshadow
      extra/yassl/taocrypt/include/algebra.hpp:
        Fixed compiler warnings
      extra/yassl/taocrypt/include/des.hpp:
        Fixed compiler warnings
      extra/yassl/taocrypt/include/hash.hpp:
        Fixed compiler warnings
      extra/yassl/taocrypt/include/hmac.hpp:
        Fixed compiler warnings
      extra/yassl/taocrypt/include/modarith.hpp:
        Fixed compiler warnings
      extra/yassl/taocrypt/include/modes.hpp:
        Fixed compiler warnings
      extra/yassl/taocrypt/include/rsa.hpp:
        Fixed compiler warnings
      extra/yassl/taocrypt/mySTL/list.hpp:
        Fixed compiler warnings
      extra/yassl/taocrypt/src/aes.cpp:
        Fixed compiler warnings
      extra/yassl/taocrypt/src/algebra.cpp:
        Fixed compiler warnings
      extra/yassl/taocrypt/src/asn.cpp:
        Fixed compiler warnings
      extra/yassl/taocrypt/test/test.cpp:
        Fixed compiler warnings
      extra/yassl/testsuite/testsuite.cpp:
        Fixed compiler warnings
      include/m_ctype.h:
        Fixed warnings found with gcc -Wshadow
      include/my_pthread.h:
        Fixed warnings found with gcc -Wshadow
      include/my_sys.h:
        Fixed warnings found with gcc -Wshadow
      include/my_time.h:
        Fixed warnings found with gcc -Wshadow
      include/mysql.h:
        Fixed warnings found with gcc -Wshadow
        Added define IS_LONGDATA() to simplify code in libmysql.c
      libmysql/libmysql.c:
        Fixed warnings found with gcc -Wshadow
        (Mostly replaced bind -> my_bind and time -> my_time)
      libmysqld/lib_sql.cc:
        Removed not used variables and labels
      myisam/ft_boolean_search.c:
        Fixed warnings found with gcc -Wshadow
      myisam/mi_open.c:
        Fixed warnings found with gcc -Wshadow
      myisam/mi_search.c:
        Fixed warnings found with gcc -Wshadow
      myisam/mi_unique.c:
        Fixed compiler warning
      myisam/myisampack.c:
        Fixed warnings found with gcc -Wshadow
      myisam/rt_index.c:
        Remove not used variables
      myisam/sort.c:
        Fixed warnings found with gcc -Wshadow
      mysql-test/r/mysqlcheck.result:
        Remove databases and tables possible left by previous test
      mysql-test/r/mysqltest.result:
        New test results
      mysql-test/t/mysql.test:
        Coverage tests
      mysql-test/t/mysqlbinlog.test:
        Coverage tests
      mysql-test/t/mysqlcheck.test:
        Remove databases and tables possible left by previous test
      mysql-test/t/mysqltest.test:
        Coverage tests
      mysys/default.c:
        Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions
      mysys/mf_iocache2.c:
        Fixed warnings found with gcc -Wshadow
      mysys/mf_keycache.c:
        Fixed warnings found with gcc -Wshadow
      mysys/my_bitmap.c:
        Fixed warnings found with gcc -Wshadow
      mysys/sha1.c:
        Fixed warnings found with gcc -Wshadow
      ndb/include/kernel/signaldata/ArbitSignalData.hpp:
        Fixed compiler warning
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        Fixed compiler warnings
      ndb/include/ndbapi/NdbReceiver.hpp:
        Fixed warnings found with gcc -Wshadow
      ndb/include/transporter/TransporterDefinitions.hpp:
        Fixed compiler warning
      ndb/include/util/InputStream.hpp:
        Fixed compiler warning
      ndb/include/util/OutputStream.hpp:
        Fixed compiler warning
      ndb/include/util/SimpleProperties.hpp:
        Fixed compiler warning
      ndb/include/util/SocketAuthenticator.hpp:
        Fixed compiler warning
      ndb/include/util/SocketServer.hpp:
        Fixed compiler warning
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        Fixed warnings found with gcc -Wshadow
      ndb/src/common/portlib/NdbTick.c:
        Fixed warnings found with gcc -Wshadow
      ndb/src/common/transporter/SHM_Transporter.cpp:
        Fixed warnings found with gcc -Wshadow
      ndb/src/common/transporter/TCP_Transporter.cpp:
        Fixed warnings found with gcc -Wshadow
      ndb/src/common/transporter/TCP_Transporter.hpp:
        Fixed compiler warning
      ndb/src/common/transporter/Transporter.cpp:
        Removed not used variable
      ndb/src/common/transporter/TransporterRegistry.cpp:
        Removed not used variable
      ndb/src/common/util/Bitmask.cpp:
        Moved function to avoid warnings of not used function
      ndb/src/common/util/ConfigValues.cpp:
        Fixed warnings found with gcc -Wshadow
      ndb/src/common/util/File.cpp:
        Fixed warnings found with gcc -Wshadow
      ndb/src/common/util/Properties.cpp:
        Fixed warnings found with gcc -Wshadow
      ndb/src/common/util/SocketClient.cpp:
        Fixed wrong return value
      ndb/src/common/util/random.c:
        Fixed warnings found with gcc -Wshadow
      ndb/src/common/util/socket_io.cpp:
        Fixed warnings found with gcc -Wshadow
      ndb/src/cw/cpcd/APIService.cpp:
        Removed not used variable
      ndb/src/cw/cpcd/main.cpp:
        Removed not used variables
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Fixed compiler warnings
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Removed not used variables
      ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Fixed compiler warnings
      ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Fixed compiler warnings
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Fixed compiler warnings
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Removed not used variables
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Fixed compiler warnings
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Fixed compiler warnings
      ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
        Removed not used variable
      ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
        Removed not used variables
      ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
        Removed not used variables
      ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
        Removed not used variables
      ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
        Fixed compiler warnings
      ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Removed not used variables
      ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
        Fixed compiler warnings
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        Fixed compiler warnings
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Removed not used variables
      ndb/src/kernel/blocks/suma/Suma.cpp:
        Removed not used variables
      ndb/src/kernel/blocks/suma/Suma.hpp:
        Fixed compiler warnings
      ndb/src/kernel/vm/MetaData.hpp:
        Fixed compiler warnings
      ndb/src/mgmapi/LocalConfig.cpp:
        Fixed warnings found with gcc -Wshadow
      ndb/src/mgmapi/mgmapi.cpp:
        Fixed warnings found with gcc -Wshadow
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Removed not used variables
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Fixed warnings found with gcc -Wshadow
        Removed not used variables
      ndb/src/mgmsrv/ConfigInfo.hpp:
        Fixed warnings found with gcc -Wshadow
      ndb/src/mgmsrv/InitConfigFileParser.cpp:
        Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Removed not used variables and functions
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Fixed compiler warnings
      ndb/src/mgmsrv/Services.cpp:
        Removed not used variables and functions
      ndb/src/mgmsrv/main.cpp:
        Removed not used variable
      ndb/src/ndbapi/ClusterMgr.hpp:
        Fixed compiler warnings
      ndb/src/ndbapi/Ndb.cpp:
        Removed not used variables
      ndb/src/ndbapi/NdbBlob.cpp:
        Removed not used variables
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Removed not used variables
      ndb/src/ndbapi/NdbIndexOperation.cpp:
        Removed not used variables
      ndb/src/ndbapi/NdbOperationDefine.cpp:
        Removed not used variables
      ndb/src/ndbapi/NdbOperationExec.cpp:
        Removed not used variables
      ndb/src/ndbapi/NdbOperationSearch.cpp:
        Removed not used variables
      ndb/src/ndbapi/NdbScanFilter.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Removed not used variables
      ndb/src/ndbapi/SignalSender.cpp:
        Removed not used variables
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Removed not used variable
      ndb/tools/delete_all.cpp:
        Removed not used variable
      ndb/tools/desc.cpp:
        Removed not used variable
      ndb/tools/drop_index.cpp:
        Removed not used variable
      ndb/tools/drop_tab.cpp:
        Removed not used variable
      ndb/tools/listTables.cpp:
        Removed not used variable
      ndb/tools/ndb_config.cpp:
        Fixed warnings found with gcc -Wshadow
        Added missing puts(desc)
      ndb/tools/restore/Restore.hpp:
        Changed delimiter to define instead of static variable, as the static variable caused a LOT of compiler warnings
        Fixed compiler warning
      ndb/tools/restore/consumer.hpp:
        Fixed compiler warning
      ndb/tools/restore/restore_main.cpp:
        Fixed compiler warnings
      ndb/tools/select_all.cpp:
        Removed not used variables
      ndb/tools/select_count.cpp:
        Removed not used variable
      server-tools/instance-manager/commands.h:
        Fixed compiler warnings
      server-tools/instance-manager/guardian.cc:
        Fixed compiler warnings
      server-tools/instance-manager/instance_options.cc:
        Removed not used variables
      server-tools/instance-manager/mysql_connection.cc:
        Fixed compiler warnings
      server-tools/instance-manager/options.cc:
        Fixed compiler warnings
      server-tools/instance-manager/options.h:
        Fixed compiler warnings
      server-tools/instance-manager/parse.cc:
        Removed not used variable
      server-tools/instance-manager/user_map.cc:
        Fixed compiler warnings
      server-tools/instance-manager/user_map.h:
        Fixed compiler warnings
      sql/field.cc:
        Fixed compiler warnings
      sql/field.h:
        Fixed compiler warnings
      sql/filesort.cc:
        Fixed compiler warnings
      sql/ha_archive.cc:
        Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings
      sql/ha_archive.h:
        Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings
      sql/ha_federated.cc:
        Fixed compiler warnings
      sql/ha_heap.cc:
        Fixed compiler warnings
      sql/ha_myisam.cc:
        Fixed compiler warnings
      sql/ha_myisammrg.cc:
        Fixed compiler warnings
      sql/ha_ndbcluster.cc:
        Fixed compiler warnings
      sql/handler.cc:
        Fixed compiler warnings
      sql/item.cc:
        Fixed compiler warnings
      sql/item.h:
        Fixed compiler warnings
        new_item() -> clone_item(), to avoid a lot of warnings with variable 'new_item'
        el() -> element_index()
      sql/item_cmpfunc.cc:
        Fixed compiler warnings
      sql/item_cmpfunc.h:
        Fixed compiler warnings
      sql/item_func.cc:
        Fixed compiler warnings
      sql/item_geofunc.cc:
        Fixed compiler warnings
      sql/item_row.h:
        Fixed compiler warnings
      sql/item_strfunc.cc:
        Fixed compiler warnings
      sql/item_subselect.cc:
        Fixed compiler warnings
      sql/item_subselect.h:
        Fixed compiler warnings
      sql/item_sum.cc:
        Fixed compiler warnings
      sql/item_timefunc.cc:
        Fixed compiler warnings
      sql/log.cc:
        Fixed compiler warnings
        More comments
        Added #ifdef HAVE_REPLICATION
      sql/log_event.cc:
        Fixed compiler warnings
      sql/log_event.h:
        Fixed compiler warnings
      sql/mysql_priv.h:
        query_id -> global_query_id, to avoid a lot of clashes with function and class variables
        start_time -> server_start_time
      sql/mysqld.cc:
        Fixed compiler warnings:
        - Removed not used variables
        - Added #ifndef EMBEDDED_LIBRARY
        - Fixed shadow warnings
      sql/net_serv.cc:
        Fixed compiler warnings
      sql/opt_range.cc:
        range -> last_range to avoid shadow warnings
        Removed not used function print_rowid()
      sql/opt_range.h:
        range -> last_range to avoid shadow warnings
      sql/password.c:
        Fixed compiler warnings
      sql/protocol.cc:
        Fixed compiler warnings
      sql/repl_failsafe.cc:
        Fixed compiler warnings
      sql/set_var.cc:
        Fixed compiler warnings
      sql/set_var.h:
        type() -> show_type()
        Fixed compiler warnings
      sql/slave.cc:
        Fixed compiler warnings
      sql/sp_head.cc:
        Fixed compiler warnings
      sql/sp_head.h:
        Fixed compiler warnings
      sql/spatial.cc:
        Fixed compiler warnings
      sql/spatial.h:
        length() -> geom_length() to avoid compiler warnings
        wkb_end -> wkb_last to avoid compiler warnings with local variables named 'wkb_end'
      sql/sql_cache.h:
        Fixed compiler warnings
      sql/sql_class.cc:
        Fixed compiler warnings
      sql/sql_class.h:
        log -> log_xid() to avoid compiler warnings
        Fixed shadow compiler warnings
      sql/sql_derived.cc:
        Removed not used variable
      sql/sql_insert.cc:
        Fixed compiler warnings
      sql/sql_lex.cc:
        Fixed compiler warnings
      sql/sql_lex.h:
        res -> saved_error to make the meaning of the variable clear and avoid shadow warnings
      sql/sql_load.cc:
        Fixed compiler warnings
      sql/sql_parse.cc:
        Fixed compiler warnings
      sql/sql_prepare.cc:
        Fixed compiler warnings
      sql/sql_select.cc:
        Fixed compiler warnings
      sql/sql_show.cc:
        Fixed compiler warnings
      sql/sql_string.cc:
        Fixed compiler warnings
      sql/sql_string.h:
        Fixed compiler warnings
      sql/sql_table.cc:
        Fixed compiler warnings
      sql/sql_trigger.cc:
        Fixed compiler warnings
      sql/sql_trigger.h:
        table -> trigger_table to avoid warnings from local variables
      sql/sql_union.cc:
        Fixed compiler warnings
        (mainly res -> saved_error)
      sql-common/client.c:
        Removed not used variable
      sql-common/my_time.c:
        Removed not used variable
        time -> my_time
      sql/sql_update.cc:
        Removed not used variable
      sql/sql_view.cc:
        Removed not used variable
      sql/sql_yacc.yy:
        Removed not used variable
      sql/table.cc:
        Removed not used variable
      sql/tztime.cc:
        Removed not used variable
      sql/unireg.cc:
        Removed not used variable
      strings/ctype-bin.c:
        mblen -> mb_len to avoid compiler warnings with local variable mblen
      strings/ctype-cp932.c:
        Fixed compiler warnings
      strings/ctype-eucjpms.c:
        Fixed compiler warnings
      strings/ctype-mb.c:
        mblen -> mb_len to avoid compiler warnings with local variable mblen
      strings/ctype-simple.c:
        mblen -> mb_len to avoid compiler warnings with local variable mblen
        exp -> exponent
      strings/ctype-sjis.c:
        Fixed compiler warnings
      strings/ctype-uca.c:
        mblen -> mb_len to avoid compiler warnings with local variable mblen
      strings/ctype-ujis.c:
        Fixed compiler warnings
      strings/ctype-utf8.c:
        Fixed compiler warnings
      strings/decimal.c:
        Fixed compiler warnings
      strings/my_vsnprintf.c:
        Added comment
      strings/strtod.c:
        Fixed compiler warnings
      tests/mysql_client_test.c:
        Fixed compiler warnings
        (Biggest part of patch is to not get a conflict with global function 'bind')
      f00257dd
    • unknown's avatar
      After merge fix for bug N22645 · 76bd00a9
      unknown authored
      mysql-test/t/mysqlbinlog.test:
        After merge fix
      sql/log_event.cc:
        Fixing comment, thanks to Andrei for suggestion
      76bd00a9
  9. 07 Dec, 2006 1 commit
    • unknown's avatar
      Bug#22645 LC_TIME_NAMES: Statement not replicated · c423ecc0
      unknown authored
      Implementing event based replication of LC_TIME_NAMES for 5.0
      (as a replacement of previously made ONE_SHOT replication)
      
      
      mysql-test/r/mysqlbinlog.result:
        Fixing results
      mysql-test/r/rpl_locale.result:
        Fixing results
      mysql-test/t/disabled.def:
        Enabling rpl_locale
      mysql-test/t/mysqlbinlog.test:
        Check "mysqlbinlog | mysql" reproduces lc_time_names correctly.
      mysql-test/t/rpl_locale.test:
        Adding new test: that setting lc_time_names back to en_US works fine.
      sql/log_event.cc:
        Implementing event based replication of LC_TIME_NAMES for 5.0
        (as a replacement of previously made ONE_SHOT replication)
      sql/log_event.h:
        Adding new Q_*_CODE
        Adding "lc_time_names_number" members into Query_log_event and PRINT_EVENT_INFO
      c423ecc0
  10. 28 Nov, 2006 1 commit
    • unknown's avatar
      Bug#20396 Bin Log does not get DELIMETER cmd - Recover StoredProc fails · 36c7cfd7
      unknown authored
      Problem: when loading mysqlbinlog dumps, CREATE PROCEDURE having semicolons
      in their bodies failed.
      Fix: Using safe delimiter "/*!*/;" to dump log entries.
      
      
      client/mysqlbinlog.cc:
        - Adding PRINT_EVENT_INFO argument to dump_xxx_log_entries()
        - Setting delimiter to "/*!*/;" before calling dump functions
      mysql-test/r/ctype_ucs_binlog.result:
        Fixing test results
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Fixing test results
      mysql-test/r/mysqlbinlog.result:
        Fixing test results
        Adding test case
      mysql-test/r/mysqlbinlog2.result:
        Fixing test results
      mysql-test/r/rpl_charset.result:
        Fixing test results
      mysql-test/r/rpl_timezone.result:
        Fixing test results
      mysql-test/r/user_var-binlog.result:
        Fixing test results
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Fixing LIKE expression
      mysql-test/t/mysqlbinlog.test:
        Adding test case
      sql/log_event.cc:
        Using print_event_info->delimiter instead of
        hard-coded semicolon as a query end marker.
      sql/log_event.h:
        Adding new member to store delimiter.
      36c7cfd7
  11. 26 Jul, 2006 1 commit
    • unknown's avatar
      Bug#21218 Test "mysqlbinlog" fails to execute another program on Windows · ef0cc9eb
      unknown authored
       - Modify test case to workaround the test tool problem
       - (Null merge into 5.0)
      
      
      mysql-test/t/mysqlbinlog.test:
        Send the ouput from "mysqlbinlog" to a file and then read execute it with "mysql"
        This is a workaround for a windows bug in the test tools in mysql-4.1, which makes
        it impossible to use "|" to send the output from one program directly to the other.
        This has been fixed in mysql-5.0.
      ef0cc9eb
  12. 24 Jul, 2006 1 commit
  13. 31 May, 2006 2 commits
  14. 28 May, 2006 1 commit
    • unknown's avatar
      BUG#14157: utf8 encoding in binlog without set character_set_client · d50e3433
      unknown authored
      refining the test case to exclude problems with koi8r on some platforms.
      
      
      mysql-test/t/mysqlbinlog.test:
        replacing unavailble on some platforms koi8r with latin1 still to preserve the essence of the testcase:
        to generate utf8 names in binlog, despite client charset was different, and
        to digest this binlog.
      d50e3433
  15. 20 May, 2006 1 commit
    • unknown's avatar
      #14157: utf8 encoding in binlog without set character_set_client · 85528e63
      unknown authored
      fixing an issue with the test portability.
      
      
      mysql-test/t/mysqlbinlog.test:
        BUG#14157: utf8 encoding in binlog without set character_set_client
        
        fixing koi8r specific case to run on all platforms. client does not announce in cmd line any specific
        encoding but rather set it via `set names'.
      85528e63
  16. 16 May, 2006 1 commit
  17. 14 May, 2006 1 commit
    • unknown's avatar
      BUG#14157: utf8 encoding in binlog without set character_set_client · d388da98
      unknown authored
      fixing names length. Got an issue when merged to 5.0, decided to fix starting from 4.1
      
      
      mysql-test/t/mysqlbinlog.test:
        fixing temp table name to fit to 64 bytes for 5.0
      mysql-test/t/rpl_temporary.test:
        fixing temp table name to fit to 64 bytes for 5.0
      d388da98
  18. 13 May, 2006 1 commit
    • unknown's avatar
      BUG#14157: utf8 encoding in binlog without set character_set_client · 62be79a2
      unknown authored
      fixing a path to find charset by $MYSQL client. I believe the fix is done what should be
      by default. 
      
      
      mysql-test/t/mysqlbinlog.test:
        --character-sets-dir=../sql/share/charsets  is added otherwise client/.libs/lt-mysql
        searches in /usr/local/mysql ... A bug?
      mysql-test/t/rpl_temporary.test:
        --character-sets-dir=../sql/share/charsets/
      62be79a2
  19. 09 May, 2006 1 commit
    • unknown's avatar
      BUG#14157: utf8 encoding in binlog without set character_set_client e.g DROP temporary · c23c38fa
      unknown authored
      Binlog lacks encoding info about DROPped temporary table.
      
      Idea of the fix is to switch temporary to system_charset_info when a temporary table
      is DROPped for binlog. Since that is the server, that automatically, but not the client, who generates the query
      the binlog should be updated on the server's encoding for the coming DROP.
      The `write_binlog_with_system_charset()' is introduced to replace similar problematic places in the code.
      
      
      mysql-test/r/drop_temp_table.result:
        results changed
      mysql-test/r/mix_innodb_myisam_binlog.result:
        results changed
      mysql-test/r/mysqlbinlog.result:
        results changed
      mysql-test/r/rpl_temporary.result:
        results changed
      mysql-test/t/mysqlbinlog.test:
        Check roll-forward recovery from binlog where there are DROP temporary tables created
        in koi8r.
      mysql-test/t/rpl_temporary.test:
        Check slave digests binlog with DROP temporary tables created in koi8r.
      sql/mysql_priv.h:
        `write_binlog_with_system_charset()' is added to be called when a binlog event
        is created "implicitly" like DROP temporary table is case of closing connection.
      sql/sql_base.cc:
        Idea of the fix is to switch temporary to system_charset_info when a temporary table
        is DROPped for binlog. Since that is the server, not the client, who generates the query
        the binlog should be updated on server's encoding for the coming DROP.
      c23c38fa
  20. 10 Feb, 2006 1 commit
    • unknown's avatar
      BUG#16217 fix partly backported from 5.0. It is different in mysqlbinlog part. · a68f1715
      unknown authored
      This changeset is assumed to stay in 4.1.
      
      
      client/mysql.cc:
        BUG#16217 forced to introduce a separate mysql client command.
        Feature is backported from 5.0, precisely 
        ChangeSet 1.2034 06/02/09 16:23:09 aelkin@mysql.com
        (under second review at the moment)
      mysql-test/r/mysqlbinlog.result:
        changed in 5.0
      mysql-test/t/mysqlbinlog.test:
        backported from 5.0. The last part of the test to mimic bug#16217
      sql/log_event.cc:
        Inserting exclaiming comment command for mysql client made differently than in 5.0.
        Parsing still is cheap enough not to think to modify server code instead.
      a68f1715
  21. 09 Feb, 2006 1 commit
    • unknown's avatar
      BUG#16217 forced to introduce a separate mysql client command to adopt its · e025e47a
      unknown authored
      internal charset to one associated with currently being handled query. 
      To note such a query can come from interactive client either.
      
      There was a discussion within replication team and Monty who's suggestion won.
      It avoids straightforward parsing of all `set' queries that could affect client side 
      character set. 
      According to the idea, mysql client does not parse `set' queries but rather cares of
      `charset new_cs_name' command.
      This command is generated by mysqlbinlog in form of exclaiming comment (Lars' suggestion)
      so that enlightened clients like `mysql' knows what to do with it.
      
      Interactive human can switch between many multi-byte charsets during the session 
      providing the command explicitly. 
      To note that setting new internal mysql's charset does not
      trigger sending any `SET' sql statement to the server. 
      
      
      client/mysql.cc:
        BUG#16217 revealed the problem of switching between charsets in mysql client.
        Such switching is necessary in a case when being scanned query consists of 
        multi-byte chars and internal charset was initialized differently. mysql finds 
        `/' escape and misiterprete it 
        while in fact one could be a part of a multi-byte symbol like the bug page reported. 
        
        This patch extends mysql `charset' command, '\C' shortcut.
      mysql-test/r/ctype_ucs_binlog.result:
        comment line generated by mysqlbinlog for processing of logs with multi-byte chars.
      mysql-test/r/mysql.result:
        results are altered due to #16217
      mysql-test/r/mysqlbinlog.result:
        Results are altered due to #16217
      mysql-test/r/mysqlbinlog2.result:
        commeted command for mysql client due to multi-byte binlog
      mysql-test/r/rpl_charset.result:
        commented command for mysql due to multi-byte binlogs
      mysql-test/r/rpl_timezone.result:
        commented command for mysql client due to multi-byte binlogs
      mysql-test/r/user_var-binlog.result:
        commented command for mysql client due to multi-byte binlogs
      mysql-test/t/mysql.test:
        Main test for mysql client is extended to check `charset' command.
      mysql-test/t/mysqlbinlog.test:
        Checking how /*! \C cs_name */ are added to the output of mysqlbinlog.
        The exclaiming comment is for further processing by mysql client.
        The added part mimics the failure to recover tables from binlog - see BUG#16217.
      sql/log_event.cc:
        Sending into output instructions for mysql client to switch internally 
        to appropriate charset.
        mysql client is supposed to be invoked with --default-character-set=
        "to default character set of the server created the binlog".
      e025e47a
  22. 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
  23. 24 Sep, 2005 1 commit
    • unknown's avatar
      mysqlbinlog.test: · f437ec9a
      unknown authored
        Windows have no 'cat' command, use <
      mysql.test:
        Windows can't handle single quotes in --exec line
      
      
      mysql-test/t/mysql.test:
        Windows can't handle single quotes in --exec line
      mysql-test/t/mysqlbinlog.test:
        Windows have no 'cat' command, use <
      f437ec9a
  24. 28 Jul, 2005 1 commit
    • unknown's avatar
      Added end marker for tests to make future merges easier · 167fb5f1
      unknown authored
      mysql-test/t/alias.test:
        Added end marker for test to make future merges easier
      mysql-test/t/alter_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/analyse.test:
        Added end marker for test to make future merges easier
      mysql-test/t/analyze.test:
        Added end marker for test to make future merges easier
        Fixed length of comment lines
      mysql-test/t/ansi.test:
        Added end marker for test to make future merges easier
      mysql-test/t/archive.test:
        Added end marker for test to make future merges easier
      mysql-test/t/auto_increment.test:
        Added end marker for test to make future merges easier
      mysql-test/t/backup.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-alter-table-1.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-alter-table-2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-crash.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-deadlock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-deadlock.tminus:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bench_count_distinct.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bigint.test:
        Added end marker for test to make future merges easier
      mysql-test/t/binary.test:
        Added end marker for test to make future merges easier
      mysql-test/t/blackhole.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bool.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bulk_replace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/case.test:
        Added end marker for test to make future merges easier
      mysql-test/t/cast.test:
        Added end marker for test to make future merges easier
      mysql-test/t/check.test:
        Added end marker for test to make future merges easier
      mysql-test/t/comments.test:
        Added end marker for test to make future merges easier
      mysql-test/t/compare.test:
        Added end marker for test to make future merges easier
      mysql-test/t/connect.test:
        Added end marker for test to make future merges easier
      mysql-test/t/consistent_snapshot.test:
        Added end marker for test to make future merges easier
      mysql-test/t/constraints.test:
        Added end marker for test to make future merges easier
      mysql-test/t/count_distinct.test:
        Added end marker for test to make future merges easier
      mysql-test/t/count_distinct2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/count_distinct3.test:
        Added end marker for test to make future merges easier
      mysql-test/t/create.test:
        Added end marker for test to make future merges easier
      mysql-test/t/create_select_tmp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/csv.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_big5.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_collate.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_cp1250_ch.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_cp1251.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_cp932.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_create.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_gbk.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_latin1.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_latin1_de.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_latin2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_many.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_mb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_recoding.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_sjis.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_tis620.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_uca.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_ucs.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_ucs_binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_ujis.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_utf8.test:
        Added end marker for test to make future merges easier
      mysql-test/t/date_formats.test:
        Added end marker for test to make future merges easier
      mysql-test/t/delayed.test:
        Added end marker for test to make future merges easier
      mysql-test/t/delete.test:
        Added end marker for test to make future merges easier
      mysql-test/t/derived.test:
        Added end marker for test to make future merges easier
      mysql-test/t/dirty_close.test:
        Added end marker for test to make future merges easier
      mysql-test/t/distinct.test:
        Added end marker for test to make future merges easier
      mysql-test/t/drop.test:
        Added end marker for test to make future merges easier
      mysql-test/t/drop_temp_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/empty_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/endspace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/errors.test:
        Added end marker for test to make future merges easier
      mysql-test/t/exampledb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/explain.test:
        Added end marker for test to make future merges easier
      mysql-test/t/flush.test:
        Added end marker for test to make future merges easier
      mysql-test/t/flush_block_commit.test:
        Added end marker for test to make future merges easier
      mysql-test/t/flush_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/foreign_key.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_distinct.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_left_join.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_multi.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_order_by.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_var.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_compress.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_concat.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_crypt.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_date_add.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_default.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_des_encrypt.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_encrypt.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_encrypt_nossl.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_equal.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_gconcat.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_group.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_if.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_in.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_isnull.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_like.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_math.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_misc.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_op.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_regexp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_sapdb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_set.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_str.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_system.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_test.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_time.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_timestamp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/gcc296.test:
        Added end marker for test to make future merges easier
      mysql-test/t/gis-rtree.test:
        Added end marker for test to make future merges easier
      mysql-test/t/gis.test:
        Added end marker for test to make future merges easier
      mysql-test/t/grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/grant2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/grant_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/group_by.test:
        Added end marker for test to make future merges easier
      mysql-test/t/handler.test:
        Added end marker for test to make future merges easier
      mysql-test/t/having.test:
        Added end marker for test to make future merges easier
      mysql-test/t/heap.test:
        Added end marker for test to make future merges easier
      mysql-test/t/heap_auto_increment.test:
        Added end marker for test to make future merges easier
      mysql-test/t/heap_btree.test:
        Added end marker for test to make future merges easier
      mysql-test/t/heap_hash.test:
        Added end marker for test to make future merges easier
      mysql-test/t/help.test:
        Added end marker for test to make future merges easier
      mysql-test/t/init_connect.test:
        Added end marker for test to make future merges easier
      mysql-test/t/init_file.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb-deadlock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb-lock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb-replace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb_handler.test:
        Added end marker for test to make future merges easier
      mysql-test/t/insert.test:
        Added end marker for test to make future merges easier
      mysql-test/t/insert_select-binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/insert_select.test:
        Added end marker for test to make future merges easier
      mysql-test/t/insert_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/isam.test:
        Added end marker for test to make future merges easier
      mysql-test/t/join.test:
        Added end marker for test to make future merges easier
      mysql-test/t/join_crash.test:
        Added end marker for test to make future merges easier
      mysql-test/t/join_outer.test:
        Added end marker for test to make future merges easier
      mysql-test/t/key.test:
        Added end marker for test to make future merges easier
      mysql-test/t/key_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/key_diff.test:
        Added end marker for test to make future merges easier
      mysql-test/t/key_primary.test:
        Added end marker for test to make future merges easier
      mysql-test/t/keywords.test:
        Added end marker for test to make future merges easier
      mysql-test/t/kill.test:
        Added end marker for test to make future merges easier
      mysql-test/t/limit.test:
        Added end marker for test to make future merges easier
      mysql-test/t/loaddata.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lock_multi.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lock_tables_lost_commit.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table3.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table_qcache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/merge.test:
        Added end marker for test to make future merges easier
      mysql-test/t/metadata.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/multi_statement.test:
        Added end marker for test to make future merges easier
      mysql-test/t/multi_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/myisam-blob.test:
        Added end marker for test to make future merges easier
      mysql-test/t/myisam.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysql_client_test.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysql_protocols.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysqlbinlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysqlbinlog2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysqldump.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysqltest.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_alter_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_autodiscover.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_autodiscover2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_basic.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_blob.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_charset.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_config.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_database.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_grant.later:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_index.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_index_ordered.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_index_unique.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_insert.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_limit.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_lock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_minmax.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_multi.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_replace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_restore.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_subquery.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_transaction.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_truncate.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_types.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/negation_elimination.test:
        Added end marker for test to make future merges easier
      mysql-test/t/not_embedded_server.test:
        Added end marker for test to make future merges easier
      mysql-test/t/null.test:
        Added end marker for test to make future merges easier
      mysql-test/t/null_key.test:
        Added end marker for test to make future merges easier
      mysql-test/t/odbc.test:
        Added end marker for test to make future merges easier
      mysql-test/t/olap.test:
        Added end marker for test to make future merges easier
      mysql-test/t/openssl_1.test:
        Added end marker for test to make future merges easier
      mysql-test/t/order_by.test:
        Added end marker for test to make future merges easier
      mysql-test/t/order_fill_sortbuf.test:
        Added end marker for test to make future merges easier
      mysql-test/t/outfile.test:
        Added end marker for test to make future merges easier
      mysql-test/t/overflow.test:
        Added end marker for test to make future merges easier
      mysql-test/t/packet.test:
        Added end marker for test to make future merges easier
      mysql-test/t/preload.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_10nestset.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_11bugs.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_1general.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_2myisam.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_3innodb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_4heap.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_5merge.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_6bdb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_7ndb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/query_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/query_cache_merge.test:
        Added end marker for test to make future merges easier
      mysql-test/t/raid.test:
        Added end marker for test to make future merges easier
      mysql-test/t/range.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rename.test:
        Added end marker for test to make future merges easier
      mysql-test/t/repair.test:
        Added end marker for test to make future merges easier
      mysql-test/t/replace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rollback.test:
        Added end marker for test to make future merges easier
      mysql-test/t/row.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000001.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000002.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000004.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000005.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000006.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000008.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000009.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000010.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000011.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000012.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000013.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000015.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000017.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000018.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_EE_error.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_alter.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_chain_temp_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_change_master.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_charset.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_commit_after_flush.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_create_database.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_ddl.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_deadlock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_delete_all.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_do_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_drop.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_drop_temp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_empty_master_crash.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_error_ignored_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_failed_optimize.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_failsafe.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_flush_log_loop.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_flush_tables.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_free_items.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_get_lock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_heap.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_ignore_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_init_slave.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_innodb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_insert_id.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_insert_ignore.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_loaddata.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_loaddata_rule_m.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_loaddata_rule_s.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_loaddatalocal.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_log.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_log_pos.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_many_optimize.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_master_pos_wait.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_max_relay_size.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_misc_functions.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_delete.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_delete2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_query.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_update2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_update3.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_mystery22.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_openssl.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_optimize.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_ps.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_redirect.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_relayrotate.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_relayspace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_replicate_do.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_reset_slave.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_rewrite_db.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_rotate_logs.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_server_id1.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_server_id2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_set_charset.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_skip_error.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_sporadic_master.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_start_stop_slave.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_temporary.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_timezone.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_trunc_binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_until.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_user_variables.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_variables.test:
        Added end marker for test to make future merges easier
      mysql-test/t/select.test:
        Added end marker for test to make future merges easier
      mysql-test/t/select_found.test:
        Added end marker for test to make future merges easier
      mysql-test/t/select_safe.test:
        Added end marker for test to make future merges easier
      mysql-test/t/show_check.test:
        Added end marker for test to make future merges easier
      mysql-test/t/skip_name_resolve.test:
        Added end marker for test to make future merges easier
      mysql-test/t/sql_mode.test:
        Added end marker for test to make future merges easier
      mysql-test/t/status.test:
        Added end marker for test to make future merges easier
      mysql-test/t/subselect.test:
        Added end marker for test to make future merges easier
      mysql-test/t/subselect2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/subselect_gis.test:
        Added end marker for test to make future merges easier
      mysql-test/t/subselect_innodb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/symlink.test:
        Added end marker for test to make future merges easier
      mysql-test/t/synchronization.test:
        Added end marker for test to make future merges easier
      mysql-test/t/system_mysql_db.test:
        Added end marker for test to make future merges easier
      mysql-test/t/system_mysql_db_fix.test:
        Added end marker for test to make future merges easier
      mysql-test/t/system_mysql_db_refs.test:
        Added end marker for test to make future merges easier
      mysql-test/t/tablelock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/temp_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/timezone.test:
        Added end marker for test to make future merges easier
      mysql-test/t/timezone2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/timezone3.test:
        Added end marker for test to make future merges easier
      mysql-test/t/timezone_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/truncate.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_blob.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_date.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_datetime.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_decimal.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_enum.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_float.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_nchar.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_ranges.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_set.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_time.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_timestamp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_uint.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_year.test:
        Added end marker for test to make future merges easier
      mysql-test/t/union.test:
        Added end marker for test to make future merges easier
      mysql-test/t/update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/user_var-binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/user_var.test:
        Added end marker for test to make future merges easier
      mysql-test/t/varbinary.test:
        Added end marker for test to make future merges easier
      mysql-test/t/variables.test:
        Added end marker for test to make future merges easier
      mysql-test/t/warnings.test:
        Added end marker for test to make future merges easier
      167fb5f1
  25. 30 Mar, 2005 1 commit
    • unknown's avatar
      Eliminate most of the remaining hardcoded list of tests to skip · 57221d3d
      unknown authored
      by adding check for embedded server within tests and splitting some
      tests into multiple test files.
      
      
      mysql-test/mysql-test-run.sh:
        Remove most of hardcoded list of tests to skip
      mysql-test/r/ps_1general.result:
        Update results
      mysql-test/r/timezone2.result:
        Update results
      mysql-test/r/user_var.result:
        Update results
      mysql-test/r/variables.result:
        Update results
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Disable test with embedded server
      mysql-test/t/mysql_protocols.test:
        Disable test with embedded server
      mysql-test/t/mysqlbinlog.test:
        Disable test with embedded server
      mysql-test/t/mysqlbinlog2.test:
        Disable test with embedded server
      mysql-test/t/mysqldump.test:
        Disable test with embedded server
      mysql-test/t/packet.test:
        Disable test with embedded server
      mysql-test/t/ps_1general.test:
        Move parts of test to new ps_grant
      mysql-test/t/rename.test:
        Disable test with embedded server
      mysql-test/t/show_check.test:
        Disable test with embedded server
      mysql-test/t/system_mysql_db_fix.test:
        Disable test with embedded server
      mysql-test/t/timezone2.test:
        Move part of test to timezone_grant
      mysql-test/t/user_var.test:
        Move part of test to new user_var-binlog
      mysql-test/t/variables.test:
        Move part of test to rpl_variables
      57221d3d
  26. 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
  27. 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
  28. 04 Feb, 2005 1 commit
    • unknown's avatar
      Bug#7853 (mysqlbinlog does not accept input from stdin) · 00a71ae8
      unknown authored
        The utility 'mysqlbinlog' now accepts input from stdin. It can 
        now be used to read the output from, e.g., 'zcat' or other utility.
      
      
      client/mysqlbinlog.cc:
        Reading from stdin instead of stdout [sic].
        Not repositioning manually since my_b_read does that correctly.
      mysql-test/r/mysqlbinlog.result:
        Adding tests for reading from stdin.
      mysql-test/t/mysqlbinlog.test:
        Adding tests for reading from stdin.
      00a71ae8
  29. 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
  30. 09 Jun, 2004 1 commit
    • unknown's avatar
      Making DROP TABLE IF EXISTS, DROP DATABASE IF EXISTS, DELETE FROM, UPDATE be logged to · 43489240
      unknown authored
      binlog even if they changed nothing, and a test for this.
      This is useful when users use these commands to clean up their master and slave by issuing
      one command on master (assume master and slave have slightly different data for some
      reason and you want to clean up both).
      Note that I have not changed multi-table DELETE and multi-table UPDATE because their
      error-reporting mechanism is more complicated.
      
      
      mysql-test/r/mysqlbinlog.result:
        result update
      mysql-test/r/rpl_charset.result:
        result update
      mysql-test/r/rpl_flush_log_loop.result:
        result update
      mysql-test/r/rpl_replicate_do.result:
        result update
      mysql-test/r/rpl_temporary.result:
        result update
      mysql-test/t/mysqlbinlog.test:
        moving SET TIMESTAMP up as DROP shows up in binlog
      sql/sql_db.cc:
        DROP DATABASE IF EXISTS is now always logged to binlog, even if db did not exist
      sql/sql_delete.cc:
        DELETE FROM t is now always logged to binlog even if no rows deleted (but in this case, only if really no error).
      sql/sql_table.cc:
        DROP TABLE IF EXISTS is now always logged to binlog even if table did not exist
      sql/sql_update.cc:
        UPDATE is now always logged to binlog even if no rows updated (but in this case, only if really no error).
      43489240
  31. 18 Mar, 2004 1 commit
    • unknown's avatar
      Fix for BUG#3204 ""mysqlbinlog --read-from-remote-server this_binlog.001" prints all binlogs": · 83e696e6
      unknown authored
      we now detect that the server is sending us a log which we did not request
      by testing the info in the fake Rotate event.
      I also changed code to not print the fake Rotate which describes the
      log we asked for (it's always the first received event but old masters
      may not send it).
      
      
      client/mysqlbinlog.cc:
        Detect when the master is sending us a binlog which we have not requested,
        then stop.
        Skip the fake Rotate event if there is one (there may be none if
        the server to which we connect is < 4.0.14).
      mysql-test/r/mysqlbinlog.result:
        result update: master-bin.000002 is not printed anymore (as mysqlbinlog
        stops at the end of the requested log, master-bin.000001).
      mysql-test/t/mysqlbinlog.test:
        comment is wrong now
      83e696e6
  32. 06 Feb, 2004 1 commit
    • unknown's avatar
      fixed bug #1378 "mysqlbinlog for remote host is broken" · 7db76e5a
      unknown authored
      client/mysqlbinlog.cc:
        fixed bug #1378 "mysqlbinlog for remote host is broken"
        by using shared part of code for local and remote variant 
        (function process_event)
      mysql-test/r/mysqlbinlog.result:
        fixed results for remote variant 
        (they are the same as for local now)
      mysql-test/t/mysqlbinlog.test:
        discarded note 'V. Vagin should ...' 
        because V.Vagin done
      sql/log_event.cc:
        added special local_fname flag to Load_log_event for 
        using in Load_log_event::check_fname_outside_temp_buf 
        instead of ugly condition
      sql/log_event.h:
        added special local_fname flag to Load_log_event for 
        using in Load_log_event::check_fname_outside_temp_buf 
        instead of ugly condition
      7db76e5a
  33. 19 Dec, 2003 1 commit
    • unknown's avatar
      Now merge is done. · bc3cbfbc
      unknown authored
      For previous commit I had run only rpl* tests, here the other ones had a 
      few surprises. Latest status:
      - all tests pass
      - all replication tests pass with Valgrind
      This is the final-final commit & push.
      Doc remains.
      
      
      client/mysqlbinlog.cc:
        Making remote mysqlbinlog work with the new format of 5.0.0, and still be 
        able to talk to older servers.
        This is a quickfix, but now mysqlbinlog.test passes (mysqlbinlog seems to
        work in Valgrind, too).
      mysql-test/r/drop_temp_table.result:
        result update
      mysql-test/r/insert_select.result:
        result update
      mysql-test/r/mix_innodb_myisam_binlog.result:
        result update
      mysql-test/r/mysqlbinlog.result:
        result update
      mysql-test/t/mix_innodb_myisam_binlog.test:
        position update
      mysql-test/t/mysqlbinlog.test:
        position update
      sql/log_event.cc:
        a comment (noticed the problem by watching the results of
        mix_innodb_myisam_binlog.test)
      bc3cbfbc