Skip to content

M
MariaDB
Switch branch/tag
  1. 16 Jun, 2007 2 commits
  3. 15 Jun, 2007 19 commits
    • unknown's avatar
      Merge alf.:D:/src/mysql-5.1-maint · a555f7f2
      unknown authored 
      into  alf.:D:/src/mysql-5.1-maint_winemb


CMakeLists.txt:
  Auto merged
sql/mysqld.cc:
  Auto merged
      a555f7f2
    • unknown's avatar
      Embedded Server doesn't build on Windows. · c15380dc
      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.
      c15380dc
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 5da3d3cf
      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
      5da3d3cf
    • unknown's avatar
      Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50 · 4b7fcbbe
      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
      4b7fcbbe
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 20d54f96
      unknown authored 
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
      20d54f96
    • unknown's avatar
      Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50 · 159f02b5
      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
      159f02b5
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · b33866a8
      unknown authored 
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51


sql/sql_parse.cc:
  Auto merged
      b33866a8
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 65203a94
      unknown authored 
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
      65203a94
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 8068a6bd
      unknown authored 
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
      8068a6bd
    • unknown's avatar
      Merge mysql.com:/home/ram/work/mysql-5.0-maint · 4526a260
      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
      4526a260
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · ba094d1b
      unknown authored 
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


include/violite.h:
  Auto merged
      ba094d1b
    • unknown's avatar
      follow-up fix · 5b9e27f2
      unknown authored 
      
include/violite.h:
  this may already be defined
      5b9e27f2
    • unknown's avatar
      Backport of · bd4eab18
      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''
      bd4eab18
    • unknown's avatar
      BUG#27861 merge to 5.1 · 0f75810f
      unknown authored
      0f75810f
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 993ac255
      unknown authored 
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged
      993ac255
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build · 7ecb0526
      unknown authored 
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
      7ecb0526
    • unknown's avatar
      Added yassl and taocrypt sources to mysqlclientlib · fbe69396
      unknown authored 
      
client/CMakeLists.txt:
  Fix for bug #27861: unresolved externals (yassl and taocrypt)
      fbe69396
    • unknown's avatar
      Merge damien-katzs-computer.local:/Users/dkatz/mysql51 · 7069ffea
      unknown authored 
      into  damien-katzs-computer.local:/Users/dkatz/51_win


sql/sql_parse.cc:
  Auto merged
      7069ffea
    • unknown's avatar
      Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/51 · 5c2a786b
      unknown authored 
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51


sql/sql_select.cc:
  Auto merged
      5c2a786b
  5. 14 Jun, 2007 19 commits
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 5a81b562
      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
      5a81b562
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · c7f1e935
      unknown authored 
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
      c7f1e935
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 28ec3712
      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
      28ec3712
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 3a2f0418
      unknown authored 
      into  trift2.:/MySQL/M51/push-5.1


sql/item_func.cc:
  SCCS merged
      3a2f0418
    • unknown's avatar
      Merge trift2.:/MySQL/M41/push-4.1 · 56a20fea
      unknown authored 
      into  trift2.:/MySQL/M50/push-5.0
      56a20fea
    • unknown's avatar
      Merge trift2.:/MySQL/M41/mysql-4.1 · 77961c89
      unknown authored 
      into  trift2.:/MySQL/M41/push-4.1
      77961c89
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · d25a72a1
      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.
      d25a72a1
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · 68ede71d
      unknown authored 
      into  trift2.:/MySQL/M51/push-5.1


sql/item_func.cc:
  Auto merged
      68ede71d
    • unknown's avatar
      Bug#21723: Should be able to dump core after setuid() under Linux · 50246ee4
      unknown authored 
      In many cases, binaries can no longer dump core after calling setuid().

Where the PR_SET_DUMPABLE macro is set, use the prctl() system call 
to tell the kernel that it's allowed to dump the core of the server.


configure.in:
  Test system for "sys/prctl.h", to get access to prctl().
sql/mysqld.cc:
  Add a process-control operation that tells the Linux kernel that it 
  is allowed to dump core after setuid().
      50246ee4
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 1fcf80e9
      unknown authored 
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      1fcf80e9
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt · f26f2e26
      unknown authored 
      into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
      f26f2e26
    • unknown's avatar
      fix the binlog-stm_ps.test for the embedded-server · f3984865
      unknown authored 
      
mysql-test/t/binlog_stm_ps.test:
  embedded server doesn't have binlogs
      f3984865
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 96484c21
      unknown authored 
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      96484c21
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-5.0-opt · be2ac023
      unknown authored 
      into  magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-5.1-opt


tests/mysql_client_test.c:
  manual merge 5.0-opt -> 5.1-opt
      be2ac023
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-opt · 19aa79e7
      unknown authored 
      into  magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-merge-5.0-opt
      19aa79e7
    • unknown's avatar
      corrected valgrind problems for bug 28505 and 28934 · 5138dcd9
      unknown authored
      5138dcd9
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 89794f8f
      unknown authored 
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


client/mysqltest.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/include/mix1.inc:
  merging
mysql-test/r/innodb_mysql.result:
  merging
      89794f8f
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1 · ac3f6914
      unknown authored 
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


client/mysqltest.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/include/mix1.inc:
  merging
mysql-test/r/innodb_mysql.result:
  merging
sql/sql_select.cc:
  merging
      ac3f6914
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · ab5b1887
      unknown authored 
      into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


client/mysqltest.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/innodb_mysql.result:
  merging
mysql-test/t/innodb_mysql.test:
  merging
sql/sql_select.cc:
  merging
      ab5b1887
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7