1. 16 Jun, 2007 6 commits
  2. 15 Jun, 2007 31 commits
    • unknown's avatar
      binlog.result, binlog.test: · 651a8e7f
      unknown authored
        Post-merge fix: replace xid=* with XID to isolate from number of transactions
      
      
      mysql-test/r/binlog.result:
        Post-merge fix: replace xid=* with XID to isolate from number of transactions
      mysql-test/t/binlog.test:
        Post-merge fix: replace xid=* with XID to isolate from number of transactions
      651a8e7f
    • unknown's avatar
      Merge alf.:D:/src/mysql-5.1-maint · ad18354c
      unknown authored
      into  alf.:D:/src/mysql-5.1-maint_winemb
      
      
      CMakeLists.txt:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      ad18354c
    • unknown's avatar
      Embedded Server doesn't build on Windows. · 29041471
      unknown authored
      - Add build configuration parameter EMBEDDED_ONLY which will configure 
      the VS solution to produce only mysql embedded binary.
      - Make necessary updates to successfully compile solution.
      
      
      CMakeLists.txt:
        Embedded Server doesn't build on Windows.
        - Remove leading space from various definitions.
        - Remove optimizations from RelWithDebInfo configuration for debugging.
        - Conditionally add the necessary build directories based on 
        EMBEDDED_ONLY flag.
      BitKeeper/etc/ignore:
        Embedded Server doesn't build on Windows.
        - Ignore CMake's default configuration output directories.
        - Ignore autogenerated cmake_dummy.c file.
      libmysql/client_settings.h:
        Embedded Server doesn't build on Windows.
        - Build fixup
      libmysqld/CMakeLists.txt:
        Embedded Server doesn't build on Windows.
        - Update for recent changes.
      libmysqld/libmysqld.def:
        Embedded Server doesn't build on Windows.
        - Export necessary methods.
      libmysqld/examples/CMakeLists.txt:
        Embedded Server doesn't build on Windows.
        - Updated include directories.
        - test_libmysqld fixup.
        - Added mysqltest_embedded and mysql_client_test_embedded exes needed for
        testing.
      sql/mysqld.cc:
        Embedded Server doesn't build on Windows.
        - Build fixup.
      sql/sql_binlog.cc:
        Embedded Server doesn't build on Windows.
        - Build fixup.
      sql-common/client.c:
        Embedded Server doesn't build on Windows.
        - Build fixup.
      storage/federated/CMakeLists.txt:
        Embedded Server doesn't build on Windows.
        - Define USE_TLS for embedded only builds.
      storage/heap/CMakeLists.txt:
        Embedded Server doesn't build on Windows.
        - Define USE_TLS for embedded only builds.
      storage/innobase/CMakeLists.txt:
        Embedded Server doesn't build on Windows.
        - Define USE_TLS for embedded only builds.
      storage/myisam/CMakeLists.txt:
        Embedded Server doesn't build on Windows.
        - Define USE_TLS for embedded only builds.
      storage/myisam/ha_myisam.cc:
        Embedded Server doesn't build on Windows.
        - Define USE_TLS for embedded only builds.
      storage/myisammrg/CMakeLists.txt:
        Embedded Server doesn't build on Windows.
        - Define USE_TLS for embedded only builds.
      win/configure.js:
        Embedded Server doesn't build on Windows.
        - Add EMBEDDED_ONLY build configuration.
      29041471
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-axmrg · df2e2a94
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      mysql-test/r/view.result:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      df2e2a94
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.1-amain · 3883e4b6
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      mysql-test/r/view.result:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/mysql_priv.h:
        SCCS merged
      3883e4b6
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.1-ateam · 47f89302
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysys/mf_keycache.c:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      47f89302
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 4bc66797
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
      
      
      BitKeeper/deleted/.del-CMakeLists.txt~7:
        Auto merged
      include/violite.h:
        Auto merged
      4bc66797
    • unknown's avatar
      Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50 · b6489c19
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
      
      
      include/violite.h:
        Auto merged
      BitKeeper/deleted/.del-CMakeLists.txt~7:
        Auto merged
      b6489c19
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 3982f318
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
      
      
      3982f318
    • unknown's avatar
      Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50 · 6070617a
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42:
        Auto merged
      mysql-test/extra/binlog_tests/blackhole.test:
        Auto merged
      mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
        Auto merged
      mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
        Auto merged
      mysql-test/extra/binlog_tests/drop_temp_table.test:
        Auto merged
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Auto merged
      mysql-test/r/have_log_bin.require:
        Auto merged
      mysql-test/t/flush_block_commit_notembedded.test:
        Auto merged
      mysql-test/t/mysqlbinlog-cp932.test:
        Auto merged
      mysql-test/t/mysqlbinlog.test:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/sp_trans.test:
        Auto merged
      mysql-test/t/user_var-binlog.test:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/extra/binlog_tests/insert_select-binlog.test:
        SCCS merged
      mysql-test/r/binlog_stm_binlog.result:
        SCCS merged
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        SCCS merged
      configure.in:
        manual merge
      mysql-test/extra/binlog_tests/binlog.test:
        manual merge
      mysql-test/t/mysqlbinlog2.test:
        manual merge
      sql/mysqld.cc:
        manual merge
      6070617a
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 06783388
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
      
      
      sql/sql_parse.cc:
        Auto merged
      06783388
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · c2db927b
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
      
      
      configure.in:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      c2db927b
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 559bc939
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      559bc939
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-amain · 30057f67
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      mysql-test/r/view.result:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      30057f67
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-ateam · 352d6489
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      352d6489
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-amain · 82f757ff
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-axmrg
      
      
      82f757ff
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 08d2e29c
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
      
      
      08d2e29c
    • unknown's avatar
      Merge mysql.com:/home/ram/work/mysql-5.0-maint · 7cf764bc
      unknown authored
      into  mysql.com:/home/ram/work/mysql-5.1-maint
      
      
      BitKeeper/deleted/.del-wait_for_slave_io_to_stop.inc:
        Delete: mysql-test/include/wait_for_slave_io_to_stop.inc
      BitKeeper/deleted/.del-wait_for_slave_sql_to_stop.inc:
        Delete: mysql-test/include/wait_for_slave_sql_to_stop.inc
      BitKeeper/deleted/.del-wait_for_slave_to_start.inc:
        Delete: mysql-test/include/wait_for_slave_to_start.inc
      BitKeeper/deleted/.del-wait_for_slave_to_stop.inc:
        Delete: mysql-test/include/wait_for_slave_to_stop.inc
      7cf764bc
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 58adafc3
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      include/violite.h:
        Auto merged
      58adafc3
    • unknown's avatar
      follow-up fix · 9bba1059
      unknown authored
      
      include/violite.h:
        this may already be defined
      9bba1059
    • unknown's avatar
      Backport of · 60829746
      unknown authored
      mysql-test/include/wait_for_slave_io_to_stop.inc
      mysql-test/include/wait_for_slave_sql_to_stop.inc
      mysql-test/include/wait_for_slave_to_start.inc
      mysql-test/include/wait_for_slave_to_stop.inc
      from 5.1
      
      
      mysql-test/include/wait_for_slave_io_to_stop.inc:
        New BitKeeper file ``mysql-test/include/wait_for_slave_io_to_stop.inc''
      mysql-test/include/wait_for_slave_sql_to_stop.inc:
        New BitKeeper file ``mysql-test/include/wait_for_slave_sql_to_stop.inc''
      mysql-test/include/wait_for_slave_to_start.inc:
        New BitKeeper file ``mysql-test/include/wait_for_slave_to_start.inc''
      mysql-test/include/wait_for_slave_to_stop.inc:
        New BitKeeper file ``mysql-test/include/wait_for_slave_to_stop.inc''
      60829746
    • unknown's avatar
      BUG#27861 merge to 5.1 · d36c1aef
      unknown authored
      d36c1aef
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 32700cdb
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      BitKeeper/deleted/.del-CMakeLists.txt~7:
        Auto merged
      32700cdb
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 57726dc0
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
      
      
      57726dc0
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build · cbb364b7
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
      
      
      cbb364b7
    • unknown's avatar
      Added yassl and taocrypt sources to mysqlclientlib · 8ebcb3ee
      unknown authored
      
      client/CMakeLists.txt:
        Fix for bug #27861: unresolved externals (yassl and taocrypt)
      8ebcb3ee
    • unknown's avatar
      Additional fix for bug N26402: · a0091f64
      unknown authored
      An attempt to open file with name '????????.frm'
      can produce different errors:
      - ER_NO_SUCH_TABLE on Unix
      - ER_FILE_NOT_FOUND on Windows
      because QUESTION MARK has special meaning on Windows.
      Make sure that any of these two errors happens.
      
      
      mysql-test/r/show_check.result:
        Additional fix for bug N26402
      mysql-test/t/show_check.test:
        Additional fix for bug N26402
      a0091f64
    • unknown's avatar
      Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28862 · 1805b34e
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28862
      
      
      mysql-test/r/csv.result:
        After merge fix
      mysql-test/t/csv.test:
        After merge fix
      storage/csv/ha_tina.cc:
        After merge fix
      1805b34e
    • unknown's avatar
      Bug#28862 Extended Latin1 characters get lost in CVS engine · 39700afd
      unknown authored
        Problem: Temporary buffer which is used for quoting and escaping
        was initialized to character set utf8, and thus didn't allow
        to store data in other character sets.
        Fix: changing character set of the buffer to be able to
        store any arbitrary sequence of bytes.
      
      
      mysql-test/r/csv.result:
        Adding test case
      mysql-test/t/csv.test:
        Adding test case
      sql/examples/ha_tina.cc:
        Changing character set of the buffer to "binary".
      39700afd
    • unknown's avatar
      Merge damien-katzs-computer.local:/Users/dkatz/mysql51 · b8b23fed
      unknown authored
      into  damien-katzs-computer.local:/Users/dkatz/51_win
      
      
      sql/sql_parse.cc:
        Auto merged
      b8b23fed
    • unknown's avatar
      Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/51 · 4df04e1a
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
      
      
      sql/sql_select.cc:
        Auto merged
      4df04e1a
  3. 14 Jun, 2007 3 commits
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · e64172b9
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51
      
      
      configure.in:
        Auto merged
      BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42:
        Auto merged
      mysql-test/extra/binlog_tests/binlog.test:
        Auto merged
      mysql-test/extra/binlog_tests/blackhole.test:
        Auto merged
      mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
        Auto merged
      mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
        Auto merged
      mysql-test/extra/binlog_tests/drop_temp_table.test:
        Auto merged
      mysql-test/extra/binlog_tests/insert_select-binlog.test:
        Auto merged
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Auto merged
      mysql-test/include/mix1.inc:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/binlog_stm_binlog.result:
        Auto merged
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Auto merged
      mysql-test/r/have_log_bin.require:
        Auto merged
      mysql-test/t/flush_block_commit_notembedded.test:
        Auto merged
      mysql-test/t/insert_update.test:
        Auto merged
      mysql-test/t/mysqlbinlog-cp932.test:
        Auto merged
      mysql-test/t/mysqlbinlog2.test:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/sp_trans.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/date_formats.result:
        Use local
      mysql-test/r/partition.result:
        SCCS merged
      mysql-test/t/date_formats.test:
        Use local
      mysql-test/t/ndb_basic.test:
        manual merge
      mysql-test/t/partition.test:
        manual merge
      mysql-test/t/user_var-binlog.test:
        use local
      e64172b9
    • unknown's avatar
      Merge ppcg5.local:/Users/antony/Work/p2-bug25800.6 · f97b8c99
      unknown authored
      into  ppcg5.local:/Users/antony/Work/p2-bug25800.6.merge
      
      
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysys/mf_keycache.c:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      f97b8c99
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 578b81bb
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
      
      
      configure.in:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      578b81bb