Skip to content

M
MariaDB
Switch branch/tag
  1. 19 Jun, 2007 2 commits
  3. 18 Jun, 2007 3 commits
  5. 16 Jun, 2007 5 commits
  7. 15 Jun, 2007 23 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 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 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
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 288917f5
      unknown authored 
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
      288917f5
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 · 71c13b10
      unknown authored 
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
      71c13b10
    • 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
      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
  9. 14 Jun, 2007 7 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 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
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · cb93ff4d
      unknown authored 
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/binlog.result:
  Auto merged
mysql-test/r/have_log_bin.require:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932_notembedded.test:
  Auto merged
mysql-test/t/binlog.test:
  Auto merged
mysql-test/t/ctype_cp932_binlog.test:
  Auto merged
mysql-test/t/ctype_ucs_binlog.test:
  Auto merged
mysql-test/t/flush_block_commit_notembedded.test:
  Auto merged
mysql-test/t/insert_select-binlog.test:
  Auto merged
mysql-test/t/mysqlbinlog-cp932.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/mix_innodb_myisam_binlog.result:
  Use local
mysql-test/t/blackhole.test:
  manual merge
mysql-test/t/drop_temp_table.test:
  manual merge
mysql-test/t/mix_innodb_myisam_binlog.test:
  Use local
mysql-test/t/mysqlbinlog.test:
  Use local
      cb93ff4d
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 78d4f418
      unknown authored 
      into  trift2.:/MySQL/M51/push-5.1


sql/item_func.cc:
  SCCS merged
      78d4f418
    • unknown's avatar
      Merge trift2.:/MySQL/M41/push-4.1 · 863a953e
      unknown authored 
      into  trift2.:/MySQL/M50/push-5.0
      863a953e
    • unknown's avatar
      Merge trift2.:/MySQL/M41/mysql-4.1 · e4c320bf
      unknown authored 
      into  trift2.:/MySQL/M41/push-4.1
      e4c320bf
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · d0d6c42c
      unknown authored 
      into  trift2.:/MySQL/M50/push-5.0


sql/item_func.cc:
  Manual merge: thread identity check was gone from this place in main 5.0.
      d0d6c42c
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7