Commits · c106b08308454ff53fd751e9bc6fe6fc20afa154 · Kirill Smelkov / mariadb

19 Jun, 2006 4 commits
- after merge fix · c106b083
  gluh@mysql.com authored Jun 19, 2006
  
  c106b083
- WL#3015: Logging Improvements - No Restarts(ver N4) · 1d72c66c
  gluh@eagle.intranet.mysql.r18.ru authored Jun 19, 2006
```
Added slow_query_log & general_log global upadatable variables.
Added slow-query-log & general-log startup options.
Added log_output, general_log_file, slow_query_log_file global updatable variables.
```
  1d72c66c
- Additional fix for 18201 XML: ExtractValue works even if the xml fragment is not well-formed xml · 013fb25f
  bar@mysql.com authored Jun 19, 2006
```
Changing error number
```
  013fb25f
- Merge mysql.com:/usr/home/bar/mysql-5.1-new.b18201 · f3bda9b7
  bar@bar.intranet.mysql.r18.ru authored Jun 19, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-kt
```
  f3bda9b7
15 Jun, 2006 15 commits

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · b1164110
rburnett@bk-internal.mysql.com authored Jun 15, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
b1164110
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 5d2d3a53
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 15, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397
```
5d2d3a53
Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · c8da9ebd
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 15, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397
```
c8da9ebd
BUG#20397: Crash when alter table t1 engine = x; · b631659c
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 15, 2006
```
Review fixes
```
b631659c

Removing VC++Files directory for 5.1 since we are now using CMake. This has... · 168deb00

rburnett@production.mysql.com authored Jun 15, 2006

Removing VC++Files directory for 5.1 since we are now using CMake.  This has been cleared with Kent.

.del-zlibvc.dsw~e0a83be4be21be4d:
  Delete: VC++Files/zlib/contrib/asm386/zlibvc.dsw
.del-zlibvc.dsp~27398cfaac865081:
  Delete: VC++Files/zlib/contrib/asm386/zlibvc.dsp
.del-zlib_ia64.dsp~76d309d598061eea:
  Delete: VC++Files/zlib/zlib_ia64.dsp
.del-zlib.vcproj~9b1a681d56dae190:
  Delete: VC++Files/zlib/zlib.vcproj
.del-zlib.dsp~503559fb84963a0d:
  Delete: VC++Files/zlib/zlib.dsp
.del-vio_ia64.dsp~cdfbb900c43e7f10:
  Delete: VC++Files/vio/vio_ia64.dsp
.del-vio.vcproj~b7c21b4e2d6a9b85:
  Delete: VC++Files/vio/vio.vcproj
.del-vio.dsp~52ab62f9d499195a:
  Delete: VC++Files/vio/vio.dsp
.del-thr_test_ia64.dsp~2ff226f5ce3197b4:
  Delete: VC++Files/thr_test/thr_test_ia64.dsp
.del-thr_test.vcproj~fc0e15c1e6880160:
  Delete: VC++Files/thr_test/thr_test.vcproj
.del-thr_test.dsp~af5f73d3335a6303:
  Delete: VC++Files/thr_test/thr_test.dsp
.del-thr_test.c~70fc0971c72f2a95:
  Delete: VC++Files/thr_test/thr_test.c
.del-thr_insert_test.dsp~e21944f040fb55a9:
  Delete: VC++Files/thr_insert_test/thr_insert_test.dsp
.del-test1_ia64.dsp~42406d943e5f20f9:
  Delete: VC++Files/test1/test1_ia64.dsp
.del-mysql_client_test_ia64.dsp~6a2b9edf3a66a00b:
  Delete: VC++Files/tests/mysql_client_test_ia64.dsp
.del-mysql_client_test.vcproj~22188dcd372bc9de:
  Delete: VC++Files/tests/mysql_client_test.vcproj
.del-mysql_client_test.dsp~d7b5fed623acb964:
  Delete: VC++Files/tests/mysql_client_test.dsp
.del-test1.vcproj~c474b4614c67e2d2:
  Delete: VC++Files/test1/test1.vcproj
.del-test1.dsp~83f105f472a193:
  Delete: VC++Files/test1/test1.dsp
.del-strings.dsw~74e53a6013b0da99:
  Delete: VC++Files/strings/noMASM/strings.dsw
.del-strings.dsp~7b4d145dfc64e39:
  Delete: VC++Files/strings/noMASM/strings.dsp
.del-mysql_thr.c~20772782813d1274:
  Delete: VC++Files/test1/mysql_thr.c
.del-strings_ia64.dsp~4cbf5c6548d3b4a4:
  Delete: VC++Files/strings/strings_ia64.dsp
.del-strings.vcproj~6d1126ae59e4bf82:
  Delete: VC++Files/strings/strings.vcproj
.del-strings.dsw~fc04f19f9c41f6ea:
  Delete: VC++Files/strings/strings.dsw
.del-strings.dsw~44d2027eeeea00d6:
  Delete: VC++Files/strings/backup/strings.dsw
.del-strings.dsp~de6c79f1cc99a48:
  Delete: VC++Files/strings/strings.dsp
.del-strings.dsp~d1f09e84a9861d86:
  Delete: VC++Files/strings/backup/strings.dsp
.del-strings.dsw~72e5896282b294d5:
  Delete: VC++Files/strings/MASM6x/strings.dsw
.del-strings.dsp~ba34297c3be0c3aa:
  Delete: VC++Files/strings/MASM6x/strings.dsp
.del-myisammrg_ia64.dsp~ffe1ccdf77392d5a:
  Delete: VC++Files/storage/myisammrg/myisammrg_ia64.dsp
.del-myisammrg.vcproj~624417d12268d061:
  Delete: VC++Files/storage/myisammrg/myisammrg.vcproj
.del-myisammrg.dsp~983cc2678e60e979:
  Delete: VC++Files/storage/myisammrg/myisammrg.dsp
.del-myisam_ia64.dsp~ed98417b58974118:
  Delete: VC++Files/storage/myisam/myisam_ia64.dsp
.del-myisam.vcproj~c8ad2ba4e8fb2b21:
  Delete: VC++Files/storage/myisam/myisam.vcproj
.del-myisam.dsp~db522ff879e7720f:
  Delete: VC++Files/storage/myisam/myisam.dsp
.del-innobase_ia64.dsp~dc7a9c2937f8fe75:
  Delete: VC++Files/storage/innobase/innobase_ia64.dsp
.del-innobase.vcproj~4a6cd1221518a77f:
  Delete: VC++Files/storage/innobase/innobase.vcproj
.del-innobase.dsp~8a85302e27197083:
  Delete: VC++Files/storage/innobase/innobase.dsp
.del-libdb_tcl.def~bf5926f22f130545:
  Delete: VC++Files/storage/bdb/build_win32/libdb_tcl.def
.del-heap_ia64.dsp~496a0b7e1268ef8e:
  Delete: VC++Files/storage/heap/heap_ia64.dsp
.del-heap.vcproj~4382203ba03f4038:
  Delete: VC++Files/storage/heap/heap.vcproj
.del-heap.dsp~ad83359791cc780:
  Delete: VC++Files/storage/heap/heap.dsp
.del-example.vcproj~ae647078a46efb6e:
  Delete: VC++Files/storage/example/example.vcproj
.del-libdb.def~898715818fce00a:
  Delete: VC++Files/storage/bdb/build_win32/libdb.def
.del-excxx_tpcb.dsp~c2d09192efb7c6f1:
  Delete: VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp
.del-excxx_mpool.dsp~b98b16a8b35b2724:
  Delete: VC++Files/storage/bdb/build_win32/excxx_mpool.dsp
.del-excxx_lock.dsp~c11419f4c472fd93:
  Delete: VC++Files/storage/bdb/build_win32/excxx_lock.dsp
.del-excxx_env.dsp~a76359c56b592402:
  Delete: VC++Files/storage/bdb/build_win32/excxx_env.dsp
.del-excxx_btrec.dsp~ef7959c1c777234f:
  Delete: VC++Files/storage/bdb/build_win32/excxx_btrec.dsp
.del-excxx_access.dsp~63d67774c47ee39:
  Delete: VC++Files/storage/bdb/build_win32/excxx_access.dsp
.del-ex_tpcb.dsp~303f15835d3608c:
  Delete: VC++Files/storage/bdb/build_win32/ex_tpcb.dsp
.del-ex_mpool.dsp~7fdaf9e8399340e:
  Delete: VC++Files/storage/bdb/build_win32/ex_mpool.dsp
.del-ex_lock.dsp~dd9b8ad7ca7fb617:
  Delete: VC++Files/storage/bdb/build_win32/ex_lock.dsp
.del-ex_env.dsp~2ef0d5f066cb2ae7:
  Delete: VC++Files/storage/bdb/build_win32/ex_env.dsp
.del-ex_btrec.dsp~5e8268bdd6eb02da:
  Delete: VC++Files/storage/bdb/build_win32/ex_btrec.dsp
.del-ex_access.dsp~dedbebade1266682:
  Delete: VC++Files/storage/bdb/build_win32/ex_access.dsp
.del-db_verify.dsp~8d56f94abea8d89b:
  Delete: VC++Files/storage/bdb/build_win32/db_verify.dsp
.del-db_upgrade.dsp~c0eeab4121e3b43b:
  Delete: VC++Files/storage/bdb/build_win32/db_upgrade.dsp
.del-db_test.dsp~c5df2b5cdf7d240f:
  Delete: VC++Files/storage/bdb/build_win32/db_test.dsp
.del-db_tcl.dsp~fe347860ef24d36b:
  Delete: VC++Files/storage/bdb/build_win32/db_tcl.dsp
.del-db_static1.dsp~93cdd4a79c56117f:
  Delete: VC++Files/storage/bdb/build_win32/db_static1.dsp
.del-db_static.dsp~e7e19a638e56c8d5:
  Delete: VC++Files/storage/bdb/build_win32/db_static.dsp
.del-db_stat.dsp~f4322f2f6f5241e5:
  Delete: VC++Files/storage/bdb/build_win32/db_stat.dsp
.del-db_recover.dsp~516a4a0a93e5ecc2:
  Delete: VC++Files/storage/bdb/build_win32/db_recover.dsp
.del-db_printlog.dsp~817cc167432446b8:
  Delete: VC++Files/storage/bdb/build_win32/db_printlog.dsp
.del-db_load.dsp~7c0d709abbea81ee:
  Delete: VC++Files/storage/bdb/build_win32/db_load.dsp
.del-db_java.dsp~f5f6285f1e205f2:
  Delete: VC++Files/storage/bdb/build_win32/db_java.dsp
.del-db_dump.dsp~7f9cfc4363e1317c:
  Delete: VC++Files/storage/bdb/build_win32/db_dump.dsp
.del-db_dll.dsp~7d5f832f50291933:
  Delete: VC++Files/storage/bdb/build_win32/db_dll.dsp
.del-db_deadlock.dsp~12a22e0ca1a33b83:
  Delete: VC++Files/storage/bdb/build_win32/db_deadlock.dsp
.del-db_checkpoint.dsp~f14eb8d118472abf:
  Delete: VC++Files/storage/bdb/build_win32/db_checkpoint.dsp
.del-db_buildall.dsp~5d5b8082549e422f:
  Delete: VC++Files/storage/bdb/build_win32/db_buildall.dsp
.del-db_archive.dsp~dea482eaf6dc3861:
  Delete: VC++Files/storage/bdb/build_win32/db_archive.dsp
.del-bdb.vcproj~a912c68f1c2094:
  Delete: VC++Files/storage/bdb/bdb.vcproj
.del-bdb.dsp~acd664862f396dd9:
  Delete: VC++Files/storage/bdb/bdb.dsp
.del-archive.vcproj~1a017e10fae26f17:
  Delete: VC++Files/storage/archive/archive.vcproj
.del-Berkeley_DB.dsw~8c801b3e52e89bbe:
  Delete: VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw
.del-mysqldmax_ia64.dsp~25006b7cc0725ad1:
  Delete: VC++Files/sql/mysqldmax_ia64.dsp
.del-mysqldmax.dsp~5d213fe1c204142e:
  Delete: VC++Files/sql/mysqldmax.dsp
.del-mysqld_ia64.dsp~7f8cf84d81ee04e2:
  Delete: VC++Files/sql/mysqld_ia64.dsp
.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Delete: VC++Files/sql/mysqld.vcproj
.del-mysqld.dsw~fc5629c0fc1bc3af:
  Delete: VC++Files/sql/old/mysqld.dsw
.del-mysqld.dsw~2fa9d2fa9a5902ef:
  Delete: VC++Files/sql/mysqld.dsw
.del-replace_ia64.dsp~666e3b313837d42e:
  Delete: VC++Files/replace/replace_ia64.dsp
.del-mysqld.dsp~ffdbf2d234e23e56:
  Delete: VC++Files/sql/mysqld.dsp
.del-message.mc~6ff9e8e3e7294840:
  Delete: VC++Files/sql/message.mc
.del-gen_lex_hash.vcproj~544be6b6:
  Delete: VC++Files/sql/gen_lex_hash.vcproj
.del-gen_lex_hash.dsp~540feedd:
  Delete: VC++Files/sql/gen_lex_hash.dsp
.del-replace.vcproj~9620b1ced86e527a:
  Delete: VC++Files/replace/replace.vcproj
.del-replace.dsp~a97f6dda5abfb438:
  Delete: VC++Files/replace/replace.dsp
.del-regex_ia64.dsp~dcd4172d1a454aa3:
  Delete: VC++Files/regex/regex_ia64.dsp
.del-regex.vcproj~9dea9caafa801b26:
  Delete: VC++Files/regex/regex.vcproj
.del-regex.dsw~59ac4f03e7ef16e:
  Delete: VC++Files/regex/regex.dsw
.del-regex.dsp~99de200e71b64359:
  Delete: VC++Files/regex/regex.dsp
.del-perror_ia64.dsp~be2ccb6d1c91c625:
  Delete: VC++Files/perror/perror_ia64.dsp
.del-fulltext.vcproj~27ad6672:
  Delete: VC++Files/plugin/fulltext/fulltext.vcproj
.del-fulltext.def~27754c94:
  Delete: VC++Files/plugin/fulltext/fulltext.def
.del-perror.vcproj~86ad9dc660a048ad:
  Delete: VC++Files/perror/perror.vcproj
.del-perror.dsp~d314b288f6337f54:
  Delete: VC++Files/perror/perror.dsp
.del-mysys_ia64.dsp~7a98bd8cd01d3043:
  Delete: VC++Files/mysys/mysys_ia64.dsp
.del-mysys.vcproj~40a49d09c4184822:
  Delete: VC++Files/mysys/mysys.vcproj
.del-mysys.dsw~f9dacc88b2a51ba5:
  Delete: VC++Files/mysys/mysys.dsw
.del-mysys.dsp~32695fee91189326:
  Delete: VC++Files/mysys/mysys.dsp
.del-mysqlserver_ia64.dsp~9cd3f0532874bfbe:
  Delete: VC++Files/mysqlserver/mysqlserver_ia64.dsp
.del-mysqlserver.vcproj~327cf9fb1c5ec95d:
  Delete: VC++Files/mysqlserver/mysqlserver.vcproj
.del-mysqlserver.dsp~d99cfb2d291e3785:
  Delete: VC++Files/mysqlserver/mysqlserver.dsp
.del-dummy.cpp~38c1c081e0b4c236:
  Delete: VC++Files/mysqlserver/dummy.cpp
.del-mysqldemb_ia64.dsp~c7f7d75d542393cd:
  Delete: VC++Files/mysqldemb/mysqldemb_ia64.dsp
.del-mysqldemb.vcproj~54c64d55ccc51a7c:
  Delete: VC++Files/mysqldemb/mysqldemb.vcproj
.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Delete: VC++Files/mysqldemb/mysqldemb.dsp
.del-mysqlcheck_ia64.dsp~7123d1228c39b249:
  Delete: VC++Files/mysqlcheck/mysqlcheck_ia64.dsp
.del-mysqlcheck.vcproj~7022581c8b8a7ea2:
  Delete: VC++Files/mysqlcheck/mysqlcheck.vcproj
.del-mysqlcheck.dsp~b6295bc9b0c70650:
  Delete: VC++Files/mysqlcheck/mysqlcheck.dsp
.del-mysqlbinlog_ia64.dsp~ac0f4f9efb251f5:
  Delete: VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp
.del-mysqlbinlog.vcproj~b2a5b1868f5d6596:
  Delete: VC++Files/mysqlbinlog/mysqlbinlog.vcproj
.del-mysqlbinlog.dsp~e24094996da02d02:
  Delete: VC++Files/mysqlbinlog/mysqlbinlog.dsp
.del-myisampack_ia64.dsp~628bd80a496099d5:
  Delete: VC++Files/myisampack/myisampack_ia64.dsp
.del-myisampack.vcproj~3f7d4ec0cb56a9a0:
  Delete: VC++Files/myisampack/myisampack.vcproj
.del-myisampack.dsp~be5b602ddfb1a75a:
  Delete: VC++Files/myisampack/myisampack.dsp
.del-myisamlog_ia64.dsp~a362c2702ab87e07:
  Delete: VC++Files/myisamlog/myisamlog_ia64.dsp
.del-myisamlog.vcproj~daa6596ea386e5a7:
  Delete: VC++Files/myisamlog/myisamlog.vcproj
.del-myisamlog.dsp~9f89a0e49b84a45:
  Delete: VC++Files/myisamlog/myisamlog.dsp
.del-myisamchk_ia64.dsp~a8344727d14479e:
  Delete: VC++Files/myisamchk/myisamchk_ia64.dsp
.del-myisamchk.vcproj~982ebe5673e58fb6:
  Delete: VC++Files/myisamchk/myisamchk.vcproj
.del-myisamchk.dsp~b8627861f0e8dd3e:
  Delete: VC++Files/myisamchk/myisamchk.dsp
.del-myisam_ftdump_ia64.dsp~62d0f5a56a03242:
  Delete: VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp
.del-myisam_ftdump.vcproj~409c19b0274b7f8e:
  Delete: VC++Files/myisam_ftdump/myisam_ftdump.vcproj
.del-myisam_ftdump.dsp~8501cb3943c50bb0:
  Delete: VC++Files/myisam_ftdump/myisam_ftdump.dsp
.del-my_print_defaults_ia64.dsp~11f0e6ae16691bce:
  Delete: VC++Files/my_print_defaults/my_print_defaults_ia64.dsp
.del-mytest.dsw~2324698861155335:
  Delete: VC++Files/libmysqltest/mytest.dsw
.del-my_print_defaults.vcproj~c8aa2bd86e13c3f9:
  Delete: VC++Files/my_print_defaults/my_print_defaults.vcproj
.del-my_print_defaults.dsp~6393cfdfd0e1b2ee:
  Delete: VC++Files/my_print_defaults/my_print_defaults.dsp
.del-merge_ia64.dsp~d4848c4ba119776c:
  Delete: VC++Files/merge/merge_ia64.dsp
.del-merge.dsw~559bbc65cf36612b:
  Delete: VC++Files/merge/merge.dsw
.del-merge.dsp~ba1dc5704d438e10:
  Delete: VC++Files/merge/merge.dsp
.del-mytest.c~9a99338689e5de8:
  Delete: VC++Files/libmysqltest/mytest.c
.del-myTest_ia64.dsp~b17572b217d092e6:
  Delete: VC++Files/libmysqltest/myTest_ia64.dsp
.del-myTest.vcproj~dba5adc4fad3c06:
  Delete: VC++Files/libmysqltest/myTest.vcproj
.del-myTest.dsp~4a8c480769193952:
  Delete: VC++Files/libmysqltest/myTest.dsp
.del-myTest-package_ia64.dsp~e423b69f2c624850:
  Delete: VC++Files/libmysqltest/myTest-package_ia64.dsp
.del-myTest-package.dsp~ec9faf3287cbe2b9:
  Delete: VC++Files/libmysqltest/myTest-package.dsp
.del-test_libmysqld_ia64.dsp~d79f095fa7072b25:
  Delete: VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp
.del-test_libmysqld.vcproj~fb301d42d5c4e6f4:
  Delete: VC++Files/libmysqld/examples/test_libmysqld.vcproj
.del-test_libmysqld.dsp~681dc3c6e97a48f2:
  Delete: VC++Files/libmysqld/examples/test_libmysqld.dsp
.del-libmysqld_ia64.dsp~578ab58d5f281d2a:
  Delete: VC++Files/libmysqld/libmysqld_ia64.dsp
.del-libmysqld.vcproj~a75d5b9a5967dea0:
  Delete: VC++Files/libmysqld/libmysqld.vcproj
.del-libmysqld.dsp~78dc6a589e5a4149:
  Delete: VC++Files/libmysqld/libmysqld.dsp
.del-udf_example.dsw~91692a3d:
  Delete: VC++Files/examples/udf_example/udf_example.dsw
.del-libmysql_ia64.dsp~ddad907847ceed3:
  Delete: VC++Files/libmysql/libmysql_ia64.dsp
.del-libmysql.vcproj~e21508a4cbf96b49:
  Delete: VC++Files/libmysql/libmysql.vcproj
.del-libmysql.dsw~e7bc53b7d2c2e081:
  Delete: VC++Files/libmysql/libmysql.dsw
.del-libmysql.dsp~eebbe823fb1ed32:
  Delete: VC++Files/libmysql/libmysql.dsp
.del-udf_example.dsp~91456aca:
  Delete: VC++Files/examples/udf_example/udf_example.dsp
.del-udf_example.def~9111ef87:
  Delete: VC++Files/examples/udf_example/udf_example.def
.del-dbug_ia64.dsp~76dbb7ecf79ee3e5:
  Delete: VC++Files/dbug/dbug_ia64.dsp
.del-dbug.vcproj~1fc073f0c76a14b5:
  Delete: VC++Files/dbug/dbug.vcproj
.del-dbug.dsw~6182dd731bef15f9:
  Delete: VC++Files/dbug/dbug.dsw
.del-dbug.dsp~848b9cda893ec0cd:
  Delete: VC++Files/dbug/dbug.dsp
.del-zlibvc.dsw~c6fcbe08f7876788:
  Delete: VC++Files/contrib/minizip/zlibvc.dsw
.del-zlibvc.dsw~be3fc0a598daa999:
  Delete: VC++Files/contrib/asm386/zlibvc.dsw
.del-zlibvc.dsp~d8e6e287a364132f:
  Delete: VC++Files/contrib/asm386/zlibvc.dsp
.del-zlibvc.dsp~4661a0a47229e354:
  Delete: VC++Files/contrib/minizip/zlibvc.dsp
.del-comp_err_ia64.dsp~4b56e5e25d9e54de:
  Delete: VC++Files/comp_err/comp_err_ia64.dsp
.del-comp_err.vcproj~45c167ae5ddd5a96:
  Delete: VC++Files/comp_err/comp_err.vcproj
.del-mysqltest_ia64.dsp~fc3a4cd59af92ac8:
  Delete: VC++Files/client/mysqltest_ia64.dsp
.del-mysqltest.vcproj~21878840704179ef:
  Delete: VC++Files/client/mysqltest.vcproj
.del-mysqltest.dsp~bb948912e890ae3:
  Delete: VC++Files/client/mysqltest.dsp
.del-mysqlslap.vcproj~6f30db25e7c09b6e:
  Delete: VC++Files/client/mysqlslap.vcproj
.del-mysqlshow_ia64.dsp~5b77172f8e4fe84a:
  Delete: VC++Files/client/mysqlshow_ia64.dsp
.del-comp_err.dsp~cdd2b4a543da5d4c:
  Delete: VC++Files/comp_err/comp_err.dsp
.del-mysqlshow.vcproj~797d4fa322faa148:
  Delete: VC++Files/client/mysqlshow.vcproj
.del-mysqlshow.dsp~7166315b18f991d7:
  Delete: VC++Files/client/mysqlshow.dsp
.del-mysqlimport_ia64.dsp~c905eeae53373c68:
  Delete: VC++Files/client/mysqlimport_ia64.dsp
.del-mysqlimport.vcproj~5a30228ef641c081:
  Delete: VC++Files/client/mysqlimport.vcproj
.del-mysqlimport.dsp~d508ae2a3483f1ab:
  Delete: VC++Files/client/mysqlimport.dsp
.del-mysqldump_ia64.dsp~a2aabe898be35b31:
  Delete: VC++Files/client/mysqldump_ia64.dsp
.del-mysqldump.vcproj~22f26554166c8e38:
  Delete: VC++Files/client/mysqldump.vcproj
.del-mysqldump.dsp~a8bd23547d3fc27e:
  Delete: VC++Files/client/mysqldump.dsp
.del-mysqlclient_ia64.dsp~ecab72d5220875b:
  Delete: VC++Files/client/mysqlclient_ia64.dsp
.del-mysqlclient.vcproj~e78a73e31368a44a:
  Delete: VC++Files/client/mysqlclient.vcproj
.del-mysqlclient.dsw~1c2fa53ceaed0042:
  Delete: VC++Files/client/mysqlclient.dsw
.del-mysqlclient.dsp~c9f1abb3247adfa0:
  Delete: VC++Files/client/mysqlclient.dsp
.del-mysqlcheck_ia64.dsp~5726883250a7526a:
  Delete: VC++Files/client/mysqlcheck_ia64.dsp
.del-mysqlcheck.dsp~da7dcab87501f05b:
  Delete: VC++Files/client/mysqlcheck.dsp
.del-mysqladmin_ia64.dsp~6d8d1da649203881:
  Delete: VC++Files/client/mysqladmin_ia64.dsp
.del-mysqladmin.vcproj~178fa55cba442d50:
  Delete: VC++Files/client/mysqladmin.vcproj
.del-mysqladmin.dsp~1f8468bd768bcbcd:
  Delete: VC++Files/client/mysqladmin.dsp
.del-mysql_upgrade_ia64.dsp~c9007a313d39d7e8:
  Delete: VC++Files/client/mysql_upgrade_ia64.dsp
.del-mysql_upgrade.vcproj~54815b7265120589:
  Delete: VC++Files/client/mysql_upgrade.vcproj
.del-mysql_upgrade.dsp~e44498c4a2714360:
  Delete: VC++Files/client/mysql_upgrade.dsp
.del-mysql_ia64.dsp~e651942397edd7e5:
  Delete: VC++Files/client/mysql_ia64.dsp
.del-mysql.vcproj~f7bfe13a8836eea0:
  Delete: VC++Files/client/mysql.vcproj
.del-mysql.dsp~1ea3b71c5b73913b:
  Delete: VC++Files/client/mysql.dsp
.del-prepare~773a10a535120a7e:
  Delete: VC++Files/prepare
.del-mysql_ia64.dsw~5030d1d1d4c87330:
  Delete: VC++Files/mysql_ia64.dsw
.del-mysql.sln~76a9ff1e793b3547:
  Delete: VC++Files/mysql.sln
.del-mysql.dsw~7ea9e16395f139f4:
  Delete: VC++Files/mysql.dsw
.del-mysql.dsp~9d6eee4fc1d54ca5:
  Delete: VC++Files/mysql.dsp
.del-fix-project-files~892fb27fa831ee36:
  Delete: VC++Files/fix-project-files
.del-copy_mysql_files.bat~f6878eeb80173de9:
  Delete: VC++Files/copy_mysql_files.bat
.del-README.build-files~8aa38ef3fb2ffc61:
  Delete: VC++Files/README.build-files

168deb00

Many files: · 364cf6d7
rburnett@production.mysql.com authored Jun 15, 2006
```
  Small corrections after a bad merge
```
364cf6d7
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 384fa9b6
rburnett@bk-internal.mysql.com authored Jun 15, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
384fa9b6
Merge mysql.com:/home/mydev/mysql-5.1--main · 33e38a67
ingo@chilla.local authored Jun 15, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge
```
33e38a67
Fixed typo in variable name · 32c45f92
mskold@mysql.com authored Jun 15, 2006

32c45f92
Removed stray bracket · 7636df86
mskold@mysql.com authored Jun 15, 2006

7636df86
Merge mysql.com:/home/mydev/mysql-5.0-amerge · 2b6b5b63
ingo@mysql.com authored Jun 15, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge
```
2b6b5b63
Merge rurik.mysql.com:/home/igor/tmp_merge · 88b0e989
igor@rurik.mysql.com authored Jun 14, 2006
```
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
```
88b0e989
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1 · 2b02a2aa
acurtis@ltamd64.xiphis.org authored Jun 14, 2006
```
into  xiphis.org:/home/antony/work2/p2-bug20168.4
```
2b02a2aa
merge fixes · 3e0cfd1b
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006

3e0cfd1b
Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · d02f358a
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
```
d02f358a

14 Jun, 2006 21 commits
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · fea2fa62
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
```
  fea2fa62
- merge update · 67e6e8b4
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006
  
  67e6e8b4
- Merge xiphis.org:/home/antony/work2/p2-bug20168.2 · 13ded6a6
  acurtis@xiphis.org authored Jun 14, 2006
```
into  xiphis.org:/home/antony/work2/p2-bug20168.4
```
  13ded6a6
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 2746b739
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
```
  2746b739
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 49b9b9a0
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  49b9b9a0
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 01046bb7
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  01046bb7
- Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL · 47271c6b
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
- correction of backport error
```
  47271c6b
- Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL · 2fcf737f
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
- make sure to disable bulk insert when check for duplicate key is needed
```
  2fcf737f
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 · 9b79108e
  joerg@trift2. authored Jun 14, 2006
```
into mysql.com:/M51/bug18810-5.1
```
  9b79108e
- Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M51/bug18810-5.1 · 075bb7fa
  joerg@trift2. authored Jun 14, 2006
  
  075bb7fa
- Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M50/bug18810-5.0 · 6448fca6
  joerg@mysql.com authored Jun 14, 2006
  
  6448fca6
- support-files/mysql.server.sh : Fix the startup sequence. bug#18810 + bug#20118 · 054cc44e
  joerg@mysql.com authored Jun 14, 2006
  
  054cc44e
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19801 · 8484ea8b
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
```
  8484ea8b
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · e91454f8
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
```
  e91454f8
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · b51515c9
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19801
```
  b51515c9
- BUG#19801: Problems with single partition with only NULL allowed in LIST partitioning · ac0354c7
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006
```
After review fix
```
  ac0354c7
- BUG#16002: Unsigned partition function support · 2dd60990
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006
```
After review fix
```
  2dd60990
- Fixed variable description · 61788c74
  mskold@mysql.com authored Jun 14, 2006
  
  61788c74
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · c70ed99f
  mskold@linux.site authored Jun 14, 2006
```
into  mysql.com:/home/marty/MySQL/mysql-5.1
```
  c70ed99f
- After merge fix. · 5d4b5dea
  svoj@may.pils.ru authored Jun 14, 2006
  
  5d4b5dea
- Merge may.pils.ru:/home/svoj/devel/mysql/merge/mysql-5.0-merge · 64bcd2cc
  svoj@may.pils.ru authored Jun 14, 2006
```
into  may.pils.ru:/home/svoj/devel/mysql/merge/mysql-5.1
```
  64bcd2cc