mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
43 commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
unknown
|
21713178b6 |
deleted conflicting file
BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1: Delete: VC++Files/mysqlshutdown/MYSQL.ICO |
||
|
unknown
|
f16887c59c |
Merge with 4.0.16
BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-mysqldump.result: Delete: mysql-test/r/mysqldump.result BitKeeper/deleted/.del-mysqldump.test: Delete: mysql-test/t/mysqldump.test BitKeeper/deleted/.del-compile-netware-max: Delete: netware/BUILD/compile-netware-max BitKeeper/deleted/.del-compile-netware-max-debug: Delete: netware/BUILD/compile-netware-max-debug BitKeeper/deleted/.del-compile-netware-src: Delete: netware/BUILD/compile-netware-src BitKeeper/deleted/.del-knetware.imp: Delete: netware/BUILD/knetware.imp BUILD/compile-pentium-valgrind-max: Auto merged BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183: Auto merged BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql: Auto merged BitKeeper/deleted/.del-openssl.imp: Delete: netware/BUILD/openssl.imp acinclude.m4: Auto merged SSL/cacert.pem: Auto merged SSL/client-cert.pem: Auto merged SSL/server-cert.pem: Auto merged client/mysqlbinlog.cc: Auto merged extra/resolveip.c: Auto merged heap/hp_test2.c: Auto merged include/my_global.h: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged libmysql/libmysql.def: Auto merged libmysqld/examples/Makefile.am: Auto merged myisam/mi_check.c: Auto merged myisam/mi_test2.c: Auto merged myisam/myisamdef.h: Auto merged mysql-test/r/fulltext_multi.result: Auto merged mysql-test/r/fulltext_order_by.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/user_var.result: Auto merged mysql-test/std_data/rpl_loaddata2.dat: Auto merged mysql-test/t/rpl_loaddata.test: Auto merged mysql-test/t/select.test: Auto merged mysql-test/t/user_var.test: Auto merged mysys/mf_dirname.c: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/des_key_file.cc: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.h: Auto merged sql-bench/crash-me.sh: Auto merged sql-bench/server-cfg.sh: Auto merged sql-bench/test-insert.sh: Auto merged sql-bench/test-transactions.sh: Auto merged sql/sql_base.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged support-files/mysql.server.sh: Auto merged client/mysqltest.c: Merge with 4.0.16 Changed version number to '2.0' to avoid confusion with version numbering in 3.23 mysql-test/r/distinct.result: Updated results for merge mysql-test/r/insert.result: Updated results for merge mysql-test/r/insert_select.result: Updated results for merge mysql-test/r/join_outer.result: Updated results for merge mysql-test/r/mix_innodb_myisam_binlog.result: Updated results for merge mysql-test/r/order_by.result: Updated results for merge mysql-test/r/rpl000009.result: Updated results for merge mysql-test/r/rpl_loaddata.result: Updated results for merge mysql-test/r/rpl_log.result: Updated results for merge mysql-test/r/select_safe.result: Updated results for merge scripts/mysql_install_db.sh: Change -eq to = BitKeeper/deleted/.del-ins000001.test~2428ee5c9b1bc483: dummy |
||
|
unknown
|
dfacd7c5fa |
Merge with 3.23.58
BitKeeper/etc/logging_ok: auto-union mytest-old.c: Merge rename: VC++Files/libmysqltest/mytest.c -> mytest-old.c BitKeeper/deleted/.del-mysqlshutdown.c: Delete: VC++Files/mysqlshutdown/mysqlshutdown.c BitKeeper/deleted/.del-mysqlshutdown.rc: Delete: VC++Files/mysqlshutdown/mysqlshutdown.rc BitKeeper/deleted/.del-mysqlwatch.c: Delete: VC++Files/mysqlwatch/mysqlwatch.c BitKeeper/deleted/.del-thr_test.c: Delete: VC++Files/thr_test/thr_test.c BitKeeper/deleted/.del-make_win_src_distribution.sh: Delete: scripts/make_win_src_distribution.sh BitKeeper/deleted/.del-.fgl~cac6624e1ac6ee1d: Auto merged BitKeeper/deleted/.del-Build.tsb~f3be7d512e6d5b74: Auto merged BitKeeper/deleted/.del-Clients and Tools.fgl~826a8e3f651af365: Auto merged BitKeeper/deleted/.del-Default.cdf~1da6505528200d5e: Auto merged BitKeeper/deleted/.del-Default.fdf~466762fdf65e1477: Auto merged BitKeeper/deleted/.del-Default.fgl~45b9e847fa4da131: Auto merged BitKeeper/deleted/.del-Default.fgl~a86ce70180b5aba4: Auto merged BitKeeper/deleted/.del-Default.rge~2218627c2a901409: Auto merged BitKeeper/deleted/.del-Default.shl~a02a9093c2b6b0d9: Auto merged BitKeeper/deleted/.del-Default.shl~e18d3f10bef97a28: Auto merged BitKeeper/deleted/.del-Development.fgl~ca1458874a3fef81: Auto merged BitKeeper/deleted/.del-Grant Tables.fgl~31e527d126c42d90: Auto merged BitKeeper/deleted/.del-MySQL 3.23.com.ipr~eb817edea43c6e6e: Auto merged BitKeeper/deleted/.del-SETUP.BMP~77e20d86bceb4903: Auto merged BitKeeper/deleted/.del-Servers.fgl~36147accb82f759: Auto merged BitKeeper/deleted/.del-Setup.dbg~688e9d3ec362ec34: Auto merged BitKeeper/deleted/.del-Setup.ino~85f07a856a69a722: Auto merged BitKeeper/deleted/.del-Setup.ins~ab68efc133d8411e: Auto merged BitKeeper/deleted/.del-Setup.obs~2f09140119879bc6: Auto merged BitKeeper/deleted/.del-Setup.rul~14510a994d515f19: Auto merged BitKeeper/deleted/.del-Setup.tsb~e74dbc7688d4019a: Auto merged BitKeeper/deleted/.del-infolist.txt~58b203247936d266: Auto merged BitKeeper/deleted/.del-infolist.txt~ee370f4771c83a97: Auto merged BitKeeper/deleted/.del-value.shl~718b5b291d5ff04d: Auto merged BitKeeper/deleted/.del-value.shl~98c2851db96b919e: Auto merged BitKeeper/deleted/.del-Documentation.fgl~cf0ac866737a5c7d: Auto merged configure.in: Merge with 3.23.58 (Keep old code) sql/slave.cc: Merge with 3.23.58 (Keep old code) sql/sql_parse.cc: Merge with 3.23.58 (Keep old code) |
||
|
unknown
|
4c8bc54b7a |
Remove 3.23 InstallShield files, improve make_win_src_distribution, add extra myTest.dsp to be copied into distributions as a fix for BUG#999
BitKeeper/deleted/.del-.fgl~c7d07ad3164a2b48: Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/.fgl BitKeeper/deleted/.del-Clients and Tools.fgl~cfedc4432bdca9d: Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Clients and Tools.fgl BitKeeper/deleted/.del-Default.cdf~aa4045acaf293d36: Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.cdf BitKeeper/deleted/.del-Default.fdf~89b2af9ae5059f62: Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fdf BitKeeper/deleted/.del-Default.fgl~46b97f4278325e8: Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fgl BitKeeper/deleted/.del-Default.fgl~b9558db492415763: Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.fgl BitKeeper/deleted/.del-Development.fgl~8207e98594fe0bee: Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Development.fgl BitKeeper/deleted/.del-Documentation.fgl~dbd86cfa42705734: Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Documentation.fgl BitKeeper/deleted/.del-Grant Tables.fgl~1c366d3557e024bf: Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Grant Tables.fgl BitKeeper/deleted/.del-Default.rge~d816fd8cef3f06d5: Delete: VC++Files/InstallShield/3.23.XX-gpl/Registry Entries/Default.rge BitKeeper/deleted/.del-MySQL 3.23.XX-GPL.ipr~3116ab4aa52a6b44: Delete: VC++Files/InstallShield/3.23.XX-gpl/MySQL 3.23.XX-GPL.ipr BitKeeper/deleted/.del-Servers.fgl~c809b9515fd51041: Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Servers.fgl BitKeeper/deleted/.del-Setup.dbg~f8ba4a87c5dd90a9: Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.dbg BitKeeper/deleted/.del-Setup.ino~cb1fefacb45841a: Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ino BitKeeper/deleted/.del-Setup.ins~6946c5065a12572d: Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ins BitKeeper/deleted/.del-Setup.obs~33bf58c825ff3ac8: Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.obs BitKeeper/deleted/.del-Setup.rul~8cc4dee41dcb733f: Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.rul BitKeeper/deleted/.del-Build.tsb~43a1c0d54abb5a44: Delete: VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Build.tsb BitKeeper/deleted/.del-Default.shl~4bc5f71f8f0bd822: Delete: VC++Files/InstallShield/3.23.XX-gpl/Shell Objects/Default.shl BitKeeper/deleted/.del-Default.shl~8b61f648197f5de3: Delete: VC++Files/InstallShield/3.23.XX-gpl/String Tables/Default.shl BitKeeper/deleted/.del-SETUP.BMP~1e85725234603bfe: Delete: VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP BitKeeper/deleted/.del-Setup.tsb~5344bdc39c0e9884: Delete: VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Setup.tsb BitKeeper/deleted/.del-infolist.txt~58b203247936d266: Delete: VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt BitKeeper/deleted/.del-value.shl~98c2851db96b919e: Delete: VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl BitKeeper/deleted/.del-.fgl~cac6624e1ac6ee1d: Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/.fgl BitKeeper/deleted/.del-Clients and Tools.fgl~826a8e3f651af365: Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Clients and Tools.fgl BitKeeper/deleted/.del-Default.cdf~1da6505528200d5e: Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.cdf BitKeeper/deleted/.del-Default.fdf~466762fdf65e1477: Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fdf BitKeeper/deleted/.del-Default.fgl~45b9e847fa4da131: Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.fgl BitKeeper/deleted/.del-Default.fgl~a86ce70180b5aba4: Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fgl BitKeeper/deleted/.del-Development.fgl~ca1458874a3fef81: Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Development.fgl BitKeeper/deleted/.del-Default.rge~2218627c2a901409: Delete: VC++Files/InstallShield/3.23.XXcom/Registry Entries/Default.rge BitKeeper/deleted/.del-Documentation.fgl~cf0ac866737a5c7d: Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Documentation.fgl BitKeeper/deleted/.del-Grant Tables.fgl~31e527d126c42d90: Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Grant Tables.fgl BitKeeper/deleted/.del-MySQL 3.23.com.ipr~eb817edea43c6e6e: Delete: VC++Files/InstallShield/3.23.XXcom/MySQL 3.23.com.ipr BitKeeper/deleted/.del-Servers.fgl~36147accb82f759: Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Servers.fgl BitKeeper/deleted/.del-Setup.dbg~688e9d3ec362ec34: Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.dbg BitKeeper/deleted/.del-Setup.ino~85f07a856a69a722: Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ino BitKeeper/deleted/.del-Default.shl~a02a9093c2b6b0d9: Delete: VC++Files/InstallShield/3.23.XXcom/Shell Objects/Default.shl BitKeeper/deleted/.del-SETUP.BMP~77e20d86bceb4903: Delete: VC++Files/InstallShield/3.23.XXcom/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP BitKeeper/deleted/.del-Setup.ins~ab68efc133d8411e: Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ins BitKeeper/deleted/.del-Setup.obs~2f09140119879bc6: Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.obs BitKeeper/deleted/.del-Setup.rul~14510a994d515f19: Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.rul BitKeeper/deleted/.del-infolist.txt~ee370f4771c83a97: Delete: VC++Files/InstallShield/3.23.XXcom/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt BitKeeper/deleted/.del-Build.tsb~f3be7d512e6d5b74: Delete: VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Build.tsb BitKeeper/deleted/.del-Default.shl~e18d3f10bef97a28: Delete: VC++Files/InstallShield/3.23.XXcom/String Tables/Default.shl BitKeeper/deleted/.del-Setup.tsb~e74dbc7688d4019a: Delete: VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Setup.tsb BitKeeper/deleted/.del-value.shl~718b5b291d5ff04d: Delete: VC++Files/InstallShield/3.23.XXcom/String Tables/0009-English/value.shl BitKeeper/etc/ignore: Added hardcopy.0 to the ignore list VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt: Add VERSION tags for automation VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl: Add VERSION tags for automation VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt: Add VERSION tags for automation VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl: Add VERSION tags for automation VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt: Add VERSION tags for automation VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl: Add VERSION tags for automation scripts/make_win_src_distribution.sh: Improved unix to DOS conversion, add processing of version tags in InstallShield files |
||
|
unknown
|
dcf6e50d7d |
New Windows source package automation for 3.23
VC++Files/InstallShield/3.23.XX-com/Component Definitions/.fgl: mvdir VC++Files/InstallShield/3.23.XX-com/Component Definitions/Default.cdf: mvdir VC++Files/InstallShield/3.23.XX-com/Component Definitions/Default.fgl: mvdir VC++Files/InstallShield/3.23.XX-com/File Groups/Clients and Tools.fgl: mvdir VC++Files/InstallShield/3.23.XX-com/File Groups/Default.fdf: mvdir VC++Files/InstallShield/3.23.XX-com/File Groups/Default.fgl: mvdir VC++Files/InstallShield/3.23.XX-com/File Groups/Development.fgl: mvdir VC++Files/InstallShield/3.23.XX-com/File Groups/Documentation.fgl: mvdir VC++Files/InstallShield/3.23.XX-com/File Groups/Grant Tables.fgl: mvdir VC++Files/InstallShield/3.23.XX-com/File Groups/Servers.fgl: mvdir VC++Files/InstallShield/3.23.XX-com/MySQL 3.23.com.ipr: mvdir VC++Files/InstallShield/3.23.XX-com/Registry Entries/Default.rge: mvdir VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.dbg: mvdir VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.ino: mvdir VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.ins: mvdir VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.obs: mvdir VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.rul: mvdir VC++Files/InstallShield/3.23.XX-com/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP: mvdir VC++Files/InstallShield/3.23.XX-com/Shell Objects/Default.shl: mvdir VC++Files/InstallShield/3.23.XX-com/String Tables/Default.shl: mvdir VC++Files/InstallShield/3.23.XX-com/Text Substitutions/Build.tsb: mvdir VC++Files/InstallShield/3.23.XX-com/Text Substitutions/Setup.tsb: mvdir VC++Files/InstallShield/3.23.XX-com/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt: Add version placeholders for automation VC++Files/InstallShield/3.23.XX-com/String Tables/0009-English/value.shl: Add version placeholders for automation VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt: Add version placeholders for automation VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl: Add version placeholders for automation scripts/Makefile.am: Build make_win_src_distribution script by default BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted |
||
|
unknown
|
0fa5279543 |
merge with 4.0.15
BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-database.c~af098622e818ce0d: Auto merged BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f: Auto merged BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514: Auto merged BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183: Auto merged BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8: Auto merged Build-tools/Bootstrap: Auto merged Build-tools/Do-compile: Auto merged SSL/cacert.pem: Auto merged acconfig.h: Auto merged acinclude.m4: Auto merged configure.in: Auto merged SSL/client-cert.pem: Auto merged SSL/client-key.pem: Auto merged SSL/server-cert.pem: Auto merged SSL/server-key.pem: Auto merged VC++Files/client/mysql.dsp: Auto merged VC++Files/client/mysqladmin.dsp: Auto merged VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/client/mysqldump.dsp: Auto merged VC++Files/client/mysqlimport.dsp: Auto merged VC++Files/client/mysqlshow.dsp: Auto merged VC++Files/comp_err/comp_err.dsp: Auto merged VC++Files/innobase/innobase.dsp: Auto merged VC++Files/isamchk/isamchk.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/libmysqltest/myTest.dsp: Auto merged VC++Files/my_print_defaults/my_print_defaults.dsp: Auto merged VC++Files/myisamlog/myisamlog.dsp: Auto merged VC++Files/mysql.dsw: Auto merged VC++Files/mysqlbinlog/mysqlbinlog.dsp: Auto merged VC++Files/mysqlcheck/mysqlcheck.dsp: Auto merged VC++Files/mysqlmanager/MySqlManager.dsp: Auto merged VC++Files/mysqlserver/mysqlserver.dsp: Auto merged VC++Files/mysqlshutdown/mysqlshutdown.dsp: Auto merged VC++Files/mysys/mysys.dsp: Auto merged VC++Files/pack_isam/pack_isam.dsp: Auto merged VC++Files/perror/perror.dsp: Auto merged VC++Files/replace/replace.dsp: Auto merged VC++Files/test1/test1.dsp: Auto merged VC++Files/thr_test/thr_test.dsp: Auto merged VC++Files/vio/vio.dsp: Auto merged VC++Files/zlib/zlib.dsp: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged extra/my_print_defaults.c: Auto merged extra/resolveip.c: Auto merged include/m_string.h: Auto merged include/my_sys.h: Auto merged include/mysql_com.h: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/os/os0file.c: Auto merged isam/_search.c: Auto merged libmysql/Makefile.am: Auto merged libmysql/errmsg.c: Auto merged libmysql/libmysql.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_open.c: Auto merged myisam/mi_search.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamlog.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/group_by.result: Auto merged mysql-test/r/isam.result: Auto merged mysql-test/r/loaddata.result: Auto merged mysql-test/r/lowercase_table.result: Auto merged mysql-test/r/multi_update.result: Auto merged mysql-test/r/openssl_1.result: Auto merged mysql-test/r/packet.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/range.result: Auto merged mysql-test/r/select_safe.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/t/grant.test: Auto merged mysql-test/t/group_by.test: Auto merged mysql-test/t/lock_tables_lost_commit-master.opt: Auto merged mysql-test/t/lowercase_table.test: Auto merged mysql-test/t/multi_update.test: Auto merged mysql-test/t/openssl_1.test: Auto merged mysql-test/t/range.test: Auto merged mysql-test/t/rpl_loaddata.test: Auto merged mysql-test/t/rpl_log.test: Auto merged mysql-test/t/select_safe.test: Auto merged mysql-test/t/show_check.test: Auto merged mysql-test/t/symlink.test: Auto merged mysys/default.c: Auto merged mysys/my_getopt.c: Auto merged mysys/my_pthread.c: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/make_win_src_distribution.sh: Auto merged scripts/mysql_install_db.sh: Auto merged scripts/mysqld_safe.sh: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/item_uniq.h: Auto merged sql/log_event.h: Auto merged sql/net_serv.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_update.cc: Auto merged vio/Makefile.am: Auto merged vio/vio.c: Auto merged mysql-test/t/myisam.test: merge with 4.0.15 Extra tests mysys/mf_keycache.c: Keep local file |
||
|
unknown
|
e8007ae77b |
Update of VC++ project files (to remove link warnings)
Fix unlock error in myisamchk on windows when doing --sort-index Use SetFilePointer instead of SetFilePointerEx VC++Files/client/mysql.dsp: Update of project files VC++Files/client/mysqladmin.dsp: Update of project files VC++Files/client/mysqlclient.dsp: Update of project files VC++Files/client/mysqldump.dsp: Update of project files VC++Files/client/mysqlimport.dsp: Update of project files VC++Files/client/mysqlshow.dsp: Update of project files VC++Files/comp_err/comp_err.dsp: Update of project files VC++Files/innobase/innobase.dsp: Update of project files VC++Files/isamchk/isamchk.dsp: Update of project files VC++Files/libmysql/libmysql.dsp: Update of project files VC++Files/libmysqld/libmysqld.dsp: Update of project files VC++Files/libmysqltest/myTest.dsp: Update of project files VC++Files/my_print_defaults/my_print_defaults.dsp: Update of project files VC++Files/myisamlog/myisamlog.dsp: Update of project files VC++Files/mysql.dsw: Update of project files VC++Files/mysqlbinlog/mysqlbinlog.dsp: Update of project files VC++Files/mysqlcheck/mysqlcheck.dsp: Update of project files VC++Files/mysqldemb/mysqldemb.dsp: Update of project files VC++Files/mysqlmanager/MySqlManager.dsp: Update of project files VC++Files/mysqlserver/mysqlserver.dsp: Update of project files VC++Files/mysqlshutdown/mysqlshutdown.dsp: Update of project files VC++Files/mysys/mysys.dsp: Update of project files VC++Files/pack_isam/pack_isam.dsp: Update of project files VC++Files/perror/perror.dsp: Update of project files VC++Files/replace/replace.dsp: Update of project files VC++Files/sql/mysqld.dsp: Update of project files VC++Files/test1/test1.dsp: Update of project files VC++Files/thr_test/thr_test.dsp: Update of project files VC++Files/vio/vio.dsp: Update of project files VC++Files/zlib/zlib.dsp: Update of project files myisam/mi_check.c: Fix unlock error in myisamchk on windows when doing --sort-index myisam/mi_locking.c: Fix unlock error in myisamchk on windows when doing --sort-index myisam/myisamchk.c: New comment mysys/my_chsize.c: Use SetFilePointer instead of SetFilePointerEx, as the first is more portable sql/handler.cc: Fix compiler warning sql/log_event.cc: Fix compiler warning |
||
|
unknown
|
034b44cb9f |
Merge with 4.0.14
BitKeeper/etc/logging_ok: auto-union scripts/make_win_src_distribution.old: Merge rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution.old BUILD/compile-pentium-debug-max: Auto merged BitKeeper/deleted/.del-sel000001.result~383913ae4505ec86: Auto merged BitKeeper/deleted/.del-sel000001.test~9567c1646058cc: Auto merged Build-tools/Bootstrap: Auto merged Build-tools/Do-compile: Auto merged Docs/Makefile.am: Auto merged client/get_password.c: Auto merged client/mysql.cc: Auto merged client/mysqltest.c: Auto merged extra/perror.c: Auto merged include/config-win.h: Auto merged include/my_sys.h: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/btr/btr0pcur.c: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/buf/buf0flu.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0load.c: Auto merged innobase/include/buf0buf.h: Auto merged innobase/include/log0recv.h: Auto merged innobase/include/row0sel.h: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/ut0mem.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0log.c: Auto merged innobase/mem/mem0pool.c: Auto merged innobase/os/os0file.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/trx/trx0sys.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/ut/ut0mem.c: Auto merged innobase/ut/ut0ut.c: Auto merged myisam/ft_boolean_search.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_extra.c: Auto merged myisam/mi_key.c: Auto merged myisam/myisamdef.h: Auto merged myisammrg/myrg_queue.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/ctype_latin1_de.result: Auto merged mysql-test/r/flush.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/grant_cache.result: Auto merged mysql-test/r/join.result: Auto merged mysql-test/r/join_outer.result: Auto merged mysql-test/r/range.result: Auto merged mysql-test/r/rpl000018.result: Auto merged mysql-test/r/rpl_insert_id.result: Auto merged mysql-test/r/rpl_master_pos_wait.result: Auto merged mysql-test/r/rpl_relayspace.result: Auto merged mysql-test/r/select_safe.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/alias.test: Auto merged mysql-test/t/ctype_latin1_de.test: Auto merged mysql-test/t/fulltext_left_join.test: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/handler.test: Auto merged mysql-test/t/heap.test: Auto merged mysql-test/t/join.test: Auto merged mysql-test/t/join_outer.test: Auto merged mysql-test/t/order_by.test: Auto merged mysql-test/t/range.test: Auto merged mysql-test/t/rpl000001.test: Auto merged mysql-test/t/rpl000018.test: Auto merged mysql-test/t/rpl_insert_id.test: Auto merged mysql-test/t/sel000100.test: Auto merged mysql-test/t/select_safe.test: Auto merged mysql-test/t/type_date.test: Auto merged mysql-test/t/type_datetime.test: Auto merged mysql-test/t/user_var.test: Auto merged mysys/default.c: Auto merged mysys/mf_format.c: Auto merged mysys/my_getopt.c: Auto merged mysys/thr_lock.c: Auto merged mysys/tree.c: Auto merged scripts/Makefile.am: Auto merged scripts/mysql_install_db.sh: Auto merged scripts/mysqld_safe.sh: Auto merged sql/Makefile.am: Auto merged sql/field_conv.cc: Auto merged sql/ha_innodb.h: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_myisammrg.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/net_serv.cc: Auto merged sql/nt_servc.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_list.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_repl.h: Auto merged sql/sql_update.cc: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged sql/uniques.cc: Auto merged support-files/mysql.spec.sh: Auto merged vio/viosocket.c: Auto merged BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e: merge BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183: merge acinclude.m4: Merge with 4.0 (openssl patch) client/mysqlbinlog.cc: Merge with 4.0 in which we had added code from 4.1 (We are basicly only using the 4.1 code here) configure.in: Keep 4.1 file heap/hp_open.c: merge with 4.0 include/my_base.h: merge with 4.0 include/my_global.h: merge with 4.0 include/mysqld_error.h: merge with 4.0 innobase/ha/ha0ha.c: merge with 4.0 (Code should be same but we use indentaion from 4.0) innobase/log/log0recv.c: merge with 4.0 libmysql/libmysql.c: Remove with 4.0 code that was ported from 4.1 libmysqld/lib_sql.cc: merge with 4.0 myisam/mi_open.c: Remove 4.0 specific code myisam/myisamchk.c: merge with 4.0 myisammrg/myrg_rkey.c: merge with 4.0 mysql-test/r/alter_table.result: May need to be fixed after merge mysql-test/r/create.result: May need to be fixed after merge mysql-test/r/distinct.result: May need to be fixed after merge mysql-test/r/drop.result: May need to be fixed after merge mysql-test/r/fulltext.result: May need to be fixed after merge mysql-test/r/func_set.result: May need to be fixed after merge mysql-test/r/func_str.result: May need to be fixed after merge mysql-test/r/func_test.result: May need to be fixed after merge mysql-test/r/grant.result: May need to be fixed after merge mysql-test/r/group_by.result: May need to be fixed after merge mysql-test/r/handler.result: May need to be fixed after merge mysql-test/r/heap.result: May need to be fixed after merge mysql-test/r/innodb.result: May need to be fixed after merge mysql-test/r/insert.result: May need to be fixed after merge mysql-test/r/insert_select.result: May need to be fixed after merge mysql-test/r/key_diff.result: May need to be fixed after merge mysql-test/r/merge.result: May need to be fixed after merge mysql-test/r/myisam.result: May need to be fixed after merge mysql-test/r/order_by.result: May need to be fixed after merge mysql-test/r/query_cache.result: May need to be fixed after merge mysql-test/r/rpl_flush_log_loop.result: May need to be fixed after merge mysql-test/r/rpl_loaddata.result: May need to be fixed after merge mysql-test/r/rpl_log.result: May need to be fixed after merge mysql-test/r/rpl_log_pos.result: May need to be fixed after merge mysql-test/r/rpl_rotate_logs.result: May need to be fixed after merge mysql-test/r/select.result: May need to be fixed after merge mysql-test/r/union.result: May need to be fixed after merge mysql-test/r/user_var.result: May need to be fixed after merge mysql-test/t/alter_table.test: merge with 4.0 mysql-test/t/create.test: merge with 4.0 mysql-test/t/distinct.test: merge with 4.0 mysql-test/t/drop.test: merge with 4.0 mysql-test/t/flush.test: merge with 4.0 mysql-test/t/fulltext.test: merge with 4.0 mysql-test/t/func_set.test: merge with 4.0 mysql-test/t/func_str.test: merge with 4.0 mysql-test/t/func_test.test: merge with 4.0 mysql-test/t/grant.test: merge with 4.0 mysql-test/t/grant_cache.test: merge with 4.0 mysql-test/t/innodb.test: Add back EXPLAIN and SHOW KEYS statements, but make them independent of number of rows returned by InnoDB mysql-test/t/insert.test: merge with 4.0 mysql-test/t/insert_select.test: merge with 4.0 mysql-test/t/merge.test: merge with 4.0 mysql-test/t/query_cache.test: merge with 4.0 mysql-test/t/rpl_flush_log_loop.test: merge with 4.0 mysql-test/t/rpl_loaddata.test: merge with 4.0 mysql-test/t/rpl_rotate_logs.test: merge with 4.0 mysql-test/t/select.test: merge with 4.0 mysql-test/t/symlink.test: merge with 4.0 mysql-test/t/union.test: merge with 4.0 mysys/charset.c: merge with 4.0 scripts/mysql_fix_privilege_tables.sh: merge with 4.0 (Add quoting for some variables) sql/field.h: merge with 4.0 sql/ha_innodb.cc: merge with 4.0 sql/item_cmpfunc.cc: merge with 4.0 sql/item_cmpfunc.h: merge with 4.0 sql/item_func.h: merge with 4.0 sql/item_strfunc.cc: merge with 4.0 Fixed null handling with ELT() sql/item_timefunc.h: merge with 4.0 sql/lex.h: merge with 4.0 sql/log.cc: merge with 4.0 sql/log_event.cc: Merge with 4.0 Cleanups: - Indentation - #endif comments - Replace strmov() with *pos++= for two byte strings - Moved variable declarations to start of functions - Merged identical code (LOAD_EVENT) - Added casts when subtracting pointers Did a full diff between this and 4.0 to ensure that the file is correct after merge. sql/log_event.h: merge with 4.0 sql/mysql_priv.h: merge with 4.0 sql/mysqld.cc: merge with 4.0 sql/repl_failsafe.cc: merge with 4.0 sql/set_var.cc: merge with 4.0 sql/set_var.h: merge with 4.0 sql/share/czech/errmsg.txt: merge with 4.0 sql/share/danish/errmsg.txt: merge with 4.0 sql/share/dutch/errmsg.txt: merge with 4.0 sql/share/english/errmsg.txt: merge with 4.0 sql/share/estonian/errmsg.txt: merge with 4.0 sql/share/french/errmsg.txt: merge with 4.0 sql/share/german/errmsg.txt: merge with 4.0 sql/share/greek/errmsg.txt: merge with 4.0 sql/share/hungarian/errmsg.txt: merge with 4.0 sql/share/italian/errmsg.txt: merge with 4.0 sql/share/japanese/errmsg.txt: merge with 4.0 sql/share/korean/errmsg.txt: merge with 4.0 sql/share/norwegian-ny/errmsg.txt: merge with 4.0 sql/share/norwegian/errmsg.txt: merge with 4.0 sql/share/polish/errmsg.txt: merge with 4.0 sql/share/portuguese/errmsg.txt: merge with 4.0 sql/share/romanian/errmsg.txt: merge with 4.0 sql/share/russian/errmsg.txt: merge with 4.0 sql/share/slovak/errmsg.txt: merge with 4.0 sql/share/spanish/errmsg.txt: merge with 4.0 sql/share/swedish/errmsg.txt: merge with 4.0 sql/share/ukrainian/errmsg.txt: merge with 4.0 sql/slave.cc: Merge + some indentation fixes sql/slave.h: merge with 4.0 sql/sql_acl.cc: merge with 4.0 Some end space removal to make it easier to do future merges sql/sql_acl.h: merge with 4.0 sql/sql_cache.cc: merge with 4.0 sql/sql_class.h: merge with 4.0 sql/sql_handler.cc: merge with 4.0 sql/sql_lex.cc: merge with 4.0 sql/sql_lex.h: merge with 4.0 sql/sql_parse.cc: merge with 4.0 sql/sql_repl.cc: merge with 4.0 sql/sql_select.cc: merge with 4.0 sql/sql_table.cc: merge with 4.0 sql/sql_union.cc: Merge with 4.0 Note that I couldn't find out how to merge OPTION_FOUND_ROWS handling so this has to be fixed later sql/sql_yacc.yy: merge with 4.0 Removed end space to make merge easier vio/Makefile.am: merge with 4.0 |
||
|
unknown
|
5a3c12effb |
Merge with 3.23 tree to get latest bug fixes
BitKeeper/etc/logging_ok: auto-union sql/item_func.cc: Auto merged mysql-test/t/user_var.test: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/nt_servc.cc: Auto merged configure.in: Use local version innobase/os/os0file.c: Use local version innobase/page/page0page.c: Use local version innobase/row/row0sel.c: Use local version innobase/row/row0vers.c: Use local version mysql-test/r/order_by.result: Use local version mysql-test/r/user_var.result: merge with 3.23 mysql-test/t/order_by.test: Use local version (test is already in range.test) sql/log.cc: Use local version sql/share/spanish/errmsg.txt: merge sql/slave.cc: Use local version sql/sql_class.h: Use local version sql/sql_select.cc: Use patch in 4.0 for range with NULL problem |
||
|
unknown
|
fff1f663c2 |
Fixed some new memory leaks
Updated VC++ files VC++Files/client/mysql.dsp: Update of VC++ files VC++Files/client/mysqlclient.dsp: Update of VC++ files VC++Files/libmysqld/examples/test_libmysqld.dsp: Update of VC++ files VC++Files/libmysqld/libmysqld.def: Update of VC++ files VC++Files/libmysqld/libmysqld.dsp: Update of VC++ files VC++Files/myisam/myisam.dsp: Update of VC++ files VC++Files/mysql.dsw: Update of VC++ files VC++Files/sql/mysqld.dsp: Update of VC++ files include/mysql.h: Add missing client functions to embedded server libmysql/libmysql.def: sort functions to enable comparison with libmysqld.def libmysqld/libmysqld.c: Add missing client functions to embedded server libmysqld/libmysqld.def: sort functions to enable comparison with libmysql.def Added missing functions myisam/mi_preload.c: Fixed compiler warning. Small code cleanup scripts/make_win_src_distribution.sh: Fixed typo Don't run zip in verbose mode scripts/mysql_create_system_tables.sh: Change so that localhost has full access (to make this like 4.0) scripts/mysql_fix_privilege_tables.sh: Allow on to run this from the source distribution sql-common/client.c: Fixed memory leak sql/item_sum.cc: Removed compiler warning sql/slave.cc: Cleanup sql/sql_client.cc: Portability fix sql/sql_help.cc: Fixed memory leak |
||
|
unknown
|
bd34122680 |
InstallShield Files requested by Greg
BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted |
||
|
unknown
|
0bb5b9eadd |
Fix for mysql_list_fields & reset stmt buffers from stmt_free_result
Windows build fix VC++Files/sql/mysqld.dsp: Added sql_state.c to wrk space include/mysql_com.h: Windows build fix (mismatch declaration of my_bool and bool from defination) include/thr_alarm.h: Windows build fix libmysql/libmysql.c: Fix for mysql_list_fields & reset stmt buffers from stmt_free_result tests/client_test.c: Updated test for DEFAULT value for mysql_list_fields() New tests for mysql_stmt_free_result() |
||
|
unknown
|
3846580d3f |
1. Portability fixups for Connector/ODBC 3.52 & DBD
(Addition of mysql_fetch_column & mysql_stmt_free_result) 2. Windows build fixups for libmysqld, mysqlbinlog and mysqldemb VC++Files/mysqldemb/mysqldemb.dsp: Remove old files VC++Files/libmysqld/libmysqld.dsp: remove old files and add new ones VC++Files/mysqlbinlog/mysqlbinlog.dsp: Resolve linker errors by adding mf_tmpdir.c to binlog wrk space include/mysql.h: Portability fixups for Connector/ODBC 3.52 & DBD libmysql/libmysql.c: Portability fixups for Connector/ODBC 3.52 & DBD (Addition of mysql_fetch_column & mysql_stmt_free_result) |
||
|
unknown
|
b7eadb2a09 |
Windows build fixups (Fix for slave_net_timeout)
VC++Files/libmysqld/libmysqld.dsp: Remove the old files from Embedded library sql/slave.h: Fix for client.c - slave_net_timeout sql-common/client.c: Fix warning |
||
|
unknown
|
f403a2967b |
Fix windows build after applyiing the changes from new client.c(sql-common)
NOTE: Still the build fails to compile core server on Windows due to slave_net_timeout linker error from client.obj
and make sure to have the next changeset, which fixes this.
sql/item_geofunc.cc:
Fix warnings
sql/sql_help.cc:
Fix compiler errors
sql-common/client.c:
Delete and move redefination of shared memory stuff
libmysql/libmysql.c:
Fix for redefination stuff from client.c
VC++Files/client/mysqlclient.dsp:
add client.c
VC++Files/libmysql/libmysql.dsp:
add client.c
VC++Files/sql/mysqld.dsp:
add client.c and remove old convert.cpp and mini_client.c
|
||
|
unknown
|
fc59ec4edd |
Windows build fixups with the latest source
sql/item_cmpfunc.cc: Remove unused variables sql/mysqld.cc: fix the defination as this is different from the prototype (cl compiler failed) sql/sql_insert.cc: fix the windows error (without cast) sql/sql_show.cc: Remove unused variables include/config-win.h: Fix for Windows build to go (charsets + collation default defs) VC++Files/client/mysqlclient.dsp: Take care of newly added/removed files VC++Files/libmysql/libmysql.dsp: Take care of newly added/removed files VC++Files/sql/mysqld.dsp: Take care of newly added/removed files |
||
|
unknown
|
99740ff53d |
merge
VC++Files/libmysql/libmysql.dsp: Auto merged client/mysqlbinlog.cc: Auto merged include/my_sys.h: Auto merged libmysql/libmysql.def: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/group_by.result: Auto merged mysql-test/r/key.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/null_key.result: Auto merged mysql-test/r/order_by.result: Auto merged mysql-test/r/type_decimal.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/ctype_latin1_de-master.opt: Auto merged mysql-test/t/variables.test: Auto merged mysys/charset.c: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/share/czech/errmsg.txt: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/dutch/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/german/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged |
||
|
unknown
|
61fd4d561d |
Fix for Windows build by adding pack.c to appropriate .dsp files
libmysql/libmysql.c: Fix for Windows builds VC++Files/client/mysqlclient.dsp: Added pack.c VC++Files/libmysql/libmysql.dsp: Added pack.c |
||
|
unknown
|
daac922bc3 |
Merge with 4.0.13
BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c: Auto merged Makefile.am: Auto merged acinclude.m4: Auto merged BitKeeper/triggers/post-commit: Auto merged Build-tools/Do-compile: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/mysql.dsw: Auto merged client/mysql.cc: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqldump.c: Auto merged include/config-win.h: Auto merged include/my_base.h: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/violite.h: Auto merged innobase/buf/buf0flu.c: Auto merged innobase/buf/buf0lru.c: Auto merged innobase/include/buf0buf.h: Auto merged innobase/include/buf0lru.h: Auto merged innobase/include/row0mysql.h: Auto merged innobase/include/srv0srv.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0log.c: Auto merged innobase/log/log0recv.c: Auto merged innobase/os/os0file.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/trx/trx0sys.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/ut/ut0ut.c: Auto merged myisam/ft_boolean_search.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_key.c: Auto merged myisam/mi_open.c: Auto merged myisam/mi_range.c: Auto merged myisam/mi_search.c: Auto merged myisam/sort.c: Auto merged mysql-test/r/delete.result: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/innodb_handler.result: Auto merged mysql-test/r/join.result: Auto merged mysql-test/r/join_outer.result: Auto merged mysql-test/r/key.result: Auto merged mysql-test/r/multi_update.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/alter_table.test: Auto merged mysql-test/t/ctype_latin1_de.test: Auto merged mysql-test/t/delete.test: Auto merged mysql-test/t/fulltext.test: Auto merged mysql-test/t/innodb_handler.test: Auto merged mysql-test/t/join.test: Auto merged mysql-test/t/join_outer.test: Auto merged mysql-test/t/key.test: Auto merged mysql-test/t/multi_update.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/repair.test: Auto merged mysql-test/t/select_safe.test: Auto merged mysql-test/t/type_decimal.test: Auto merged mysql-test/t/variables.test: Auto merged mysys/default.c: Auto merged mysys/my_pthread.c: Auto merged scripts/mysql_fix_privilege_tables.sh: Auto merged scripts/mysqld_safe.sh: Auto merged sql/ha_heap.h: Auto merged sql/ha_innodb.h: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/init.cc: Auto merged sql/item.cc: Auto merged sql/item_create.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/mini_client.cc: Auto merged sql/net_serv.cc: Auto merged sql/opt_range.cc: Auto merged sql/records.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.h: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_list.h: Auto merged sql/sql_load.cc: Auto merged sql/share/czech/errmsg.txt: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/dutch/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged sql/unireg.h: Auto merged sql-bench/crash-me.sh: Auto merged sql-bench/test-transactions.sh: Auto merged strings/ctype-tis620.c: Auto merged tests/grant.res: Auto merged sql/log_event.cc: Merge with 4.0.13 Cleaned up comment syntax |
||
|
unknown
|
3d12a41d67 |
Added missing dependency to VC++ project file
Docs/internals.texi: Moved code guidelines first Fixed texinfo nodes & menus VC++Files/mysql.dsw: Added missing dependency |
||
|
unknown
|
f22be77734 |
Fixed problem when comparing a key for a multi-byte-character set. (bug 152)
Use 0x.... as strings if 'new' mode. (bug 152) Don't report -max on windows when InnoDB is enabled. (bug 332) Reset current_linfo; This could cause a hang when doing PURGE LOGS. Fix for row numbers in EXPLAIN (bug 322) Fix that USE_FRM works for all table types (bug 97) VC++Files/libmysql/libmysql.dsp: Added new source files myisam/mi_key.c: Fixed problem when comparing a key for a multi-byte-character set. myisam/mi_range.c: Fixed problem when comparing a key for a multi-byte-character set. myisam/mi_rkey.c: Fixed problem when comparing a key for a multi-byte-character set. myisam/mi_search.c: Fixed problem when comparing a key for a multi-byte-character set. myisam/mi_test2.c: Fixed printf statements myisam/myisamdef.h: Fixed problem when comparing a key for a multi-byte-character set. myisam/sort.c: Fixed printf statements mysql-test/r/ctype_latin1_de.result: New test results mysql-test/r/join.result: New test results mysql-test/r/repair.result: New test results mysql-test/r/rpl_alter.result: New test results mysql-test/t/ctype_latin1_de-master.opt: --new is needed to get 0x... strings to work properly mysql-test/t/ctype_latin1_de.test: New test for latin1_de mysql-test/t/repair.test: Test of USE_FRM and HEAP tables sql/field.cc: Fixed problem when comparing a key for a multi-byte-character set. sql/item.cc: Use 0x.... as strings if 'new' mode sql/item.h: Use 0x.... as strings if 'new' mode sql/mysqld.cc: Don't report -max on windows when InnoDB is enabled. sql/sql_analyse.cc: Removed unused variable sql/sql_insert.cc: Removed debug message sql/sql_repl.cc: Reset current_linfo; This could cause a hang when doing PURGE LOGS. sql/sql_select.cc: Fix for row numbers in EXPLAIN sql/sql_table.cc: Fix that USE_FRM works for all table types (without strange errors) sql/sql_yacc.yy: Removed compiler warnings. |
||
|
unknown
|
259cc315a5 |
Fix broken windows distribution workspace file (libmysql.dsp), which is causing VC IDE to crash while loading
Remove ctype_latin1_de.c from respective dsp files Fix to make_win_src_distribution.sh to delete all newly added IS Bitkeeper files VC++Files/libmysql/libmysql.dsp: Fix the broken file |
||
|
unknown
|
2eaaae7abb |
Exported functions required by MySQLCC
BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c: Delete: VC++Files/libmysql/libmysql.def |
||
|
unknown
|
18cccabf13 |
For to use the /libmysql/libmysql.def file instead
BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c: Delete: VC++Files/libmysql/libmysql.def |
||
|
unknown
|
a821703912 |
Merge with 4.0
BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-compile-netware-standard: Delete: netware/BUILD/compile-netware-standard BitKeeper/deleted/.del-mwenv: Delete: netware/BUILD/mwenv BitKeeper/deleted/.del-nwbootstrap: Delete: netware/BUILD/nwbootstrap BitKeeper/deleted/.del-compile-AUTOTOOLS: Delete: netware/BUILD/compile-AUTOTOOLS BitKeeper/deleted/.del-compile-linux-tools: Delete: netware/BUILD/compile-linux-tools BitKeeper/deleted/.del-compile-netware-END: Delete: netware/BUILD/compile-netware-END BitKeeper/deleted/.del-compile-netware-START: Delete: netware/BUILD/compile-netware-START BitKeeper/deleted/.del-compile-netware-all: Delete: netware/BUILD/compile-netware-all BitKeeper/deleted/.del-compile-netware-debug: Delete: netware/BUILD/compile-netware-debug BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5: Auto merged BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa: Auto merged BitKeeper/deleted/.del-mwccnlm~be63afd25a14c3f: Auto merged BitKeeper/deleted/.del-mwldnlm~efb26c57cba3c980: Auto merged BitKeeper/deleted/.del-netware.patch~f70a3a965f54d9ee: Auto merged Docs/internals.texi: Auto merged VC++Files/bdb/bdb.dsp: Auto merged VC++Files/bdb/build_win32/Berkeley_DB.dsw: Auto merged VC++Files/bdb/build_win32/db_archive.dsp: Auto merged VC++Files/bdb/build_win32/db_buildall.dsp: Auto merged VC++Files/bdb/build_win32/db_checkpoint.dsp: Auto merged VC++Files/bdb/build_win32/db_deadlock.dsp: Auto merged VC++Files/bdb/build_win32/db_dll.dsp: Auto merged VC++Files/bdb/build_win32/db_dump.dsp: Auto merged VC++Files/bdb/build_win32/db_java.dsp: Auto merged VC++Files/bdb/build_win32/db_load.dsp: Auto merged VC++Files/bdb/build_win32/db_printlog.dsp: Auto merged VC++Files/bdb/build_win32/db_recover.dsp: Auto merged VC++Files/bdb/build_win32/db_stat.dsp: Auto merged VC++Files/bdb/build_win32/db_static.dsp: Auto merged VC++Files/bdb/build_win32/db_static1.dsp: Auto merged VC++Files/bdb/build_win32/db_tcl.dsp: Auto merged VC++Files/bdb/build_win32/db_test.dsp: Auto merged VC++Files/bdb/build_win32/db_upgrade.dsp: Auto merged VC++Files/bdb/build_win32/db_verify.dsp: Auto merged VC++Files/bdb/build_win32/ex_access.dsp: Auto merged VC++Files/bdb/build_win32/ex_btrec.dsp: Auto merged VC++Files/bdb/build_win32/ex_env.dsp: Auto merged VC++Files/bdb/build_win32/ex_lock.dsp: Auto merged VC++Files/bdb/build_win32/ex_mpool.dsp: Auto merged VC++Files/bdb/build_win32/ex_tpcb.dsp: Auto merged VC++Files/bdb/build_win32/excxx_access.dsp: Auto merged VC++Files/bdb/build_win32/excxx_btrec.dsp: Auto merged VC++Files/bdb/build_win32/excxx_env.dsp: Auto merged VC++Files/bdb/build_win32/excxx_lock.dsp: Auto merged VC++Files/bdb/build_win32/excxx_mpool.dsp: Auto merged VC++Files/bdb/build_win32/excxx_tpcb.dsp: Auto merged VC++Files/client/mysql.dsp: Auto merged VC++Files/client/mysqladmin.dsp: Auto merged VC++Files/client/mysqlcheck.dsp: Auto merged VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/client/mysqlclient.dsw: Auto merged VC++Files/client/mysqldump.dsp: Auto merged VC++Files/client/mysqlimport.dsp: Auto merged VC++Files/client/mysqlshow.dsp: Auto merged VC++Files/comp_err/comp_err.dsp: Auto merged VC++Files/contrib/asm386/zlibvc.dsp: Auto merged VC++Files/contrib/asm386/zlibvc.dsw: Auto merged VC++Files/contrib/minizip/zlibvc.dsp: Auto merged VC++Files/contrib/minizip/zlibvc.dsw: Auto merged VC++Files/dbug/dbug.dsp: Auto merged VC++Files/dbug/dbug.dsw: Auto merged VC++Files/heap/heap.dsp: Auto merged VC++Files/innobase/innobase.dsp: Auto merged VC++Files/isam/isam.dsp: Auto merged VC++Files/isam/isam.dsw: Auto merged VC++Files/isamchk/isamchk.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/libmysql/libmysql.dsw: Auto merged VC++Files/libmysqld/examples/test_libmysqld.dsp: Auto merged VC++Files/libmysqld/libmysqld.dsp: Auto merged VC++Files/libmysqltest/myTest.dsp: Auto merged VC++Files/libmysqltest/mytest.dsw: Auto merged VC++Files/merge/merge.dsp: Auto merged VC++Files/merge/merge.dsw: Auto merged VC++Files/my_print_defaults/my_print_defaults.dsp: Auto merged VC++Files/myisam/myisam.dsp: Auto merged VC++Files/myisamchk/myisamchk.dsp: Auto merged VC++Files/myisamlog/myisamlog.dsp: Auto merged VC++Files/myisammrg/myisammrg.dsp: Auto merged VC++Files/mysql.dsp: Auto merged VC++Files/mysql.dsw: Auto merged VC++Files/myisampack/myisampack.dsp: Auto merged VC++Files/mysqlbinlog/mysqlbinlog.dsp: Auto merged VC++Files/mysqlcheck/mysqlcheck.dsp: Auto merged VC++Files/mysqldemb/mysqldemb.dsp: Auto merged VC++Files/mysqlmanager/MySqlManager.dsp: Auto merged VC++Files/mysqlmanager/mysqlmanager.dsw: Auto merged VC++Files/mysqlserver/mysqlserver.dsp: Auto merged VC++Files/mysqlshutdown/myshutdown.dsp: Auto merged VC++Files/mysqlshutdown/mysqlshutdown.dsp: Auto merged VC++Files/mysqlwatch/mysqlwatch.dsp: Auto merged VC++Files/mysys/mysys.dsp: Auto merged VC++Files/mysys/mysys.dsw: Auto merged VC++Files/pack_isam/pack_isam.dsp: Auto merged VC++Files/perror/perror.dsp: Auto merged VC++Files/regex/regex.dsp: Auto merged VC++Files/regex/regex.dsw: Auto merged VC++Files/replace/replace.dsp: Auto merged VC++Files/sql/mysqld.dsw: Auto merged VC++Files/sql/mysqldmax.dsp: Auto merged VC++Files/sql/old/mysqld.dsw: Auto merged VC++Files/strings/MASM6x/strings.dsp: Auto merged VC++Files/strings/MASM6x/strings.dsw: Auto merged VC++Files/strings/backup/strings.dsp: Auto merged VC++Files/strings/backup/strings.dsw: Auto merged VC++Files/strings/noMASM/strings.dsp: Auto merged VC++Files/strings/noMASM/strings.dsw: Auto merged VC++Files/strings/strings.dsw: Auto merged VC++Files/test1/test1.dsp: Auto merged VC++Files/thr_insert_test/thr_insert_test.dsp: Auto merged VC++Files/thr_test/thr_test.dsp: Auto merged VC++Files/vio/vio.dsp: Auto merged VC++Files/zlib/zlib.dsp: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlshow.c: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged include/myisam.h: Auto merged include/thr_lock.h: Auto merged include/violite.h: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/os/os0file.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/trx/trx0sys.c: Auto merged libmysqld/lib_vio.c: Auto merged myisam/mi_create.c: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/group_by.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/join.result: Auto merged mysql-test/r/rpl000001.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/t/auto_increment.test: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/func_like.test: Auto merged mysql-test/t/group_by.test: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/join.test: Auto merged mysql-test/t/type_datetime.test: Auto merged mysql-test/t/type_timestamp.test: Auto merged mysys/default.c: Auto merged mysys/thr_lock.c: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysqld_safe.sh: Auto merged sql/filesort.cc: Auto merged sql/ha_innodb.h: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/log_event.h: Auto merged sql/mf_iocache.cc: Auto merged sql/mysql_priv.h: Auto merged sql/net_serv.cc: Auto merged sql/opt_range.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/repl_failsafe.h: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_base.cc: Auto merged sql-bench/crash-me.sh: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/sql_class.h: Auto merged sql/sql_rename.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_repl.h: Auto merged sql/sql_update.cc: Auto merged sql/stacktrace.c: Auto merged sql/table.cc: Auto merged sql/unireg.h: Auto merged strings/ctype-tis620.c: Auto merged strings/t_ctype.h: Auto merged support-files/mysql.spec.sh: Auto merged tests/grant.res: Auto merged vio/viosocket.c: Auto merged |
||
|
unknown
|
606a23f551 | VC++ InstallShield Setup Programs for 4.0.XX tree | ||
|
unknown
|
b276b60e03 |
LOAD DATA INFILE is not replicated if replicate_*_table is set
LOAD DATA LOCAL INFILE was not replicated correctly VC++Files/bdb/bdb.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/Berkeley_DB.dsw: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_archive.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_buildall.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_checkpoint.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_deadlock.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_dll.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_dump.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_java.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_load.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_printlog.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_recover.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_stat.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_static.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_static1.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_tcl.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_test.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_upgrade.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_verify.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_access.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_btrec.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_env.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_lock.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_mpool.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_tpcb.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_access.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_btrec.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_env.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_lock.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_mpool.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_tpcb.dsp: Updated VC++ files +end space removed VC++Files/client/mysql.dsp: Updated VC++ files +end space removed VC++Files/client/mysqladmin.dsp: Updated VC++ files +end space removed VC++Files/client/mysqlcheck.dsp: Updated VC++ files +end space removed VC++Files/client/mysqlclient.dsp: Updated VC++ files +end space removed VC++Files/client/mysqlclient.dsw: Updated VC++ files +end space removed VC++Files/client/mysqldump.dsp: Updated VC++ files +end space removed VC++Files/client/mysqlimport.dsp: Updated VC++ files +end space removed VC++Files/client/mysqlshow.dsp: Updated VC++ files +end space removed VC++Files/comp_err/comp_err.dsp: Updated VC++ files +end space removed VC++Files/contrib/asm386/zlibvc.dsp: Updated VC++ files +end space removed VC++Files/contrib/asm386/zlibvc.dsw: Updated VC++ files +end space removed VC++Files/contrib/minizip/zlibvc.dsp: Updated VC++ files +end space removed VC++Files/contrib/minizip/zlibvc.dsw: Updated VC++ files +end space removed VC++Files/dbug/dbug.dsp: Updated VC++ files +end space removed VC++Files/dbug/dbug.dsw: Updated VC++ files +end space removed VC++Files/heap/heap.dsp: Updated VC++ files +end space removed VC++Files/innobase/innobase.dsp: Updated VC++ files +end space removed VC++Files/isam/isam.dsp: Updated VC++ files +end space removed VC++Files/isam/isam.dsw: Updated VC++ files +end space removed VC++Files/isamchk/isamchk.dsp: Updated VC++ files +end space removed VC++Files/libmysql/libmysql.dsp: Updated VC++ files +end space removed VC++Files/libmysql/libmysql.dsw: Updated VC++ files +end space removed VC++Files/libmysqld/examples/test_libmysqld.dsp: Updated VC++ files +end space removed VC++Files/libmysqld/libmysqld.dsp: Updated VC++ files +end space removed VC++Files/libmysqltest/myTest.dsp: Updated VC++ files +end space removed VC++Files/libmysqltest/mytest.dsw: Updated VC++ files +end space removed VC++Files/merge/merge.dsp: Updated VC++ files +end space removed VC++Files/merge/merge.dsw: Updated VC++ files +end space removed VC++Files/my_print_defaults/my_print_defaults.dsp: Updated VC++ files +end space removed VC++Files/myisam/myisam.dsp: Updated VC++ files +end space removed VC++Files/myisamchk/myisamchk.dsp: Updated VC++ files +end space removed VC++Files/myisamlog/myisamlog.dsp: Updated VC++ files +end space removed VC++Files/myisammrg/myisammrg.dsp: Updated VC++ files +end space removed VC++Files/myisampack/myisampack.dsp: Updated VC++ files +end space removed VC++Files/mysql.dsp: Updated VC++ files +end space removed VC++Files/mysql.dsw: Updated VC++ files +end space removed VC++Files/mysqlbinlog/mysqlbinlog.dsp: Updated VC++ files +end space removed VC++Files/mysqlcheck/mysqlcheck.dsp: Updated VC++ files +end space removed VC++Files/mysqldemb/mysqldemb.dsp: Updated VC++ files +end space removed VC++Files/mysqlmanager/MySqlManager.dsp: Updated VC++ files +end space removed VC++Files/mysqlmanager/mysqlmanager.dsw: Updated VC++ files +end space removed VC++Files/mysqlserver/mysqlserver.dsp: Updated VC++ files +end space removed VC++Files/mysqlshutdown/myshutdown.dsp: Updated VC++ files +end space removed VC++Files/mysqlshutdown/mysqlshutdown.dsp: Updated VC++ files +end space removed VC++Files/mysqlwatch/mysqlwatch.dsp: Updated VC++ files +end space removed VC++Files/mysys/mysys.dsp: Updated VC++ files +end space removed VC++Files/mysys/mysys.dsw: Updated VC++ files +end space removed VC++Files/pack_isam/pack_isam.dsp: Updated VC++ files +end space removed VC++Files/perror/perror.dsp: Updated VC++ files +end space removed VC++Files/regex/regex.dsp: Updated VC++ files +end space removed VC++Files/regex/regex.dsw: Updated VC++ files +end space removed VC++Files/replace/replace.dsp: Updated VC++ files +end space removed VC++Files/sql/mysqld.dsp: Updated VC++ files +end space removed VC++Files/sql/mysqld.dsw: Updated VC++ files +end space removed VC++Files/sql/mysqldmax.dsp: Updated VC++ files +end space removed VC++Files/sql/old/mysqld.dsw: Updated VC++ files +end space removed VC++Files/strings/MASM6x/strings.dsp: Updated VC++ files +end space removed VC++Files/strings/MASM6x/strings.dsw: Updated VC++ files +end space removed VC++Files/strings/backup/strings.dsp: Updated VC++ files +end space removed VC++Files/strings/backup/strings.dsw: Updated VC++ files +end space removed VC++Files/strings/noMASM/strings.dsp: Updated VC++ files +end space removed VC++Files/strings/noMASM/strings.dsw: Updated VC++ files +end space removed VC++Files/strings/strings.dsp: Updated VC++ files +end space removed VC++Files/strings/strings.dsw: Updated VC++ files +end space removed VC++Files/test1/test1.dsp: Updated VC++ files +end space removed VC++Files/thr_insert_test/thr_insert_test.dsp: Updated VC++ files +end space removed VC++Files/thr_test/thr_test.dsp: Updated VC++ files +end space removed VC++Files/vio/vio.dsp: Updated VC++ files +end space removed VC++Files/zlib/zlib.dsp: Updated VC++ files +end space removed include/my_global.h: Always include errno.h sql/log_event.cc: LOAD DATA INFILE is not replicated if replicate_*_table is set sql/mf_iocache.cc: LOAD DATA LOCAL INFILE was not replicated correctly |
||
|
unknown
|
0777bd04e4 |
Fix .dsp files to have all new changes to work with src disribution package script
VC++Files/client/mysqlclient.dsp: . VC++Files/libmysql/libmysql.dsp: . VC++Files/libmysqld/libmysqld.dsp: . VC++Files/myisammrg/myisammrg.dsp: . VC++Files/mysqlmanager/MySqlManager.dsp: . VC++Files/mysys/mysys.dsp: . VC++Files/strings/strings.dsp: . |
||
|
unknown
|
5d5b1fee02 |
Update to VC++ build files
VC++Files/bdb/bdb.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/Berkeley_DB.dsw: Update to 4.1.0 VC++Files/bdb/build_win32/db_archive.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_buildall.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_checkpoint.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_deadlock.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_dll.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_dump.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_java.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_load.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_printlog.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_recover.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_stat.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_static.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_static1.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_tcl.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_test.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_upgrade.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_verify.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/ex_access.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/ex_btrec.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/ex_env.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/ex_lock.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/ex_mpool.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/ex_tpcb.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/excxx_access.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/excxx_btrec.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/excxx_env.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/excxx_lock.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/excxx_mpool.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/excxx_tpcb.dsp: Update to 4.1.0 VC++Files/client/mysql.dsp: Update to 4.1.0 VC++Files/client/mysqladmin.dsp: Update to 4.1.0 VC++Files/client/mysqlcheck.dsp: Update to 4.1.0 VC++Files/client/mysqlclient.dsp: Update to 4.1.0 VC++Files/client/mysqlclient.dsw: Update to 4.1.0 VC++Files/client/mysqldump.dsp: Update to 4.1.0 VC++Files/client/mysqlimport.dsp: Update to 4.1.0 VC++Files/client/mysqlshow.dsp: Update to 4.1.0 VC++Files/comp_err/comp_err.dsp: Update to 4.1.0 VC++Files/contrib/asm386/zlibvc.dsp: Update to 4.1.0 VC++Files/contrib/asm386/zlibvc.dsw: Update to 4.1.0 VC++Files/contrib/minizip/zlibvc.dsp: Update to 4.1.0 VC++Files/contrib/minizip/zlibvc.dsw: Update to 4.1.0 VC++Files/dbug/dbug.dsp: Update to 4.1.0 VC++Files/dbug/dbug.dsw: Update to 4.1.0 VC++Files/heap/heap.dsp: Update to 4.1.0 VC++Files/innobase/innobase.dsp: Update to 4.1.0 VC++Files/isam/isam.dsp: Update to 4.1.0 VC++Files/isam/isam.dsw: Update to 4.1.0 VC++Files/isamchk/isamchk.dsp: Update to 4.1.0 VC++Files/libmysql/libmysql.dsw: Update to 4.1.0 VC++Files/libmysqld/examples/test_libmysqld.dsp: Update to 4.1.0 VC++Files/libmysqld/libmysqld.dsp: Update to 4.1.0 VC++Files/libmysqltest/myTest.dsp: Update to 4.1.0 VC++Files/libmysqltest/mytest.dsw: Update to 4.1.0 VC++Files/merge/merge.dsp: Update to 4.1.0 VC++Files/merge/merge.dsw: Update to 4.1.0 VC++Files/my_print_defaults/my_print_defaults.dsp: Update to 4.1.0 VC++Files/myisam/myisam.dsp: Update to 4.1.0 VC++Files/myisamchk/myisamchk.dsp: Update to 4.1.0 VC++Files/myisamlog/myisamlog.dsp: Update to 4.1.0 VC++Files/myisammrg/myisammrg.dsp: Update to 4.1.0 VC++Files/myisampack/myisampack.dsp: Update to 4.1.0 VC++Files/mysql.dsp: Update to 4.1.0 VC++Files/mysql.dsw: Update to 4.1.0 VC++Files/mysqlbinlog/mysqlbinlog.dsp: Update to 4.1.0 VC++Files/mysqlcheck/mysqlcheck.dsp: Update to 4.1.0 VC++Files/mysqldemb/mysqldemb.dsp: Update to 4.1.0 VC++Files/mysqlmanager/MySqlManager.dsp: Update to 4.1.0 VC++Files/mysqlmanager/mysqlmanager.dsw: Update to 4.1.0 VC++Files/mysqlserver/mysqlserver.dsp: Update to 4.1.0 VC++Files/mysqlshutdown/myshutdown.dsp: Update to 4.1.0 VC++Files/mysqlshutdown/mysqlshutdown.dsp: Update to 4.1.0 VC++Files/mysqlwatch/mysqlwatch.dsp: Update to 4.1.0 VC++Files/mysys/mysys.dsp: Update to 4.1.0 VC++Files/mysys/mysys.dsw: Update to 4.1.0 VC++Files/pack_isam/pack_isam.dsp: Update to 4.1.0 VC++Files/perror/perror.dsp: Update to 4.1.0 VC++Files/regex/regex.dsp: Update to 4.1.0 VC++Files/regex/regex.dsw: Update to 4.1.0 VC++Files/replace/replace.dsp: Update to 4.1.0 VC++Files/sql/mysqld.dsp: Update to 4.1.0 VC++Files/sql/mysqld.dsw: Update to 4.1.0 VC++Files/sql/mysqldmax.dsp: Update to 4.1.0 VC++Files/sql/old/mysqld.dsw: Update to 4.1.0 VC++Files/strings/MASM6x/strings.dsp: Update to 4.1.0 VC++Files/strings/MASM6x/strings.dsw: Update to 4.1.0 VC++Files/strings/backup/strings.dsp: Update to 4.1.0 VC++Files/strings/backup/strings.dsw: Update to 4.1.0 VC++Files/strings/noMASM/strings.dsp: Update to 4.1.0 VC++Files/strings/noMASM/strings.dsw: Update to 4.1.0 VC++Files/strings/strings.dsp: Update to 4.1.0 VC++Files/strings/strings.dsw: Update to 4.1.0 VC++Files/test1/test1.dsp: Update to 4.1.0 VC++Files/thr_insert_test/thr_insert_test.dsp: Update to 4.1.0 VC++Files/thr_test/thr_test.dsp: Update to 4.1.0 VC++Files/vio/vio.dsp: Update to 4.1.0 VC++Files/zlib/zlib.dsp: Update to 4.1.0 bdb/build_win32/Berkeley_DB.dsw: Update to 4.1.0 |
||
|
unknown
|
e2c7d5d7ec | Windows build fix | ||
|
unknown
|
eebc67f6f8 |
Merge with 4.0.8
BitKeeper/etc/logging_ok: auto-union VC++Files/sql/mysqld.dsp: Auto merged acinclude.m4: Auto merged include/my_base.h: Auto merged include/myisam.h: Auto merged include/myisammrg.h: Auto merged libmysql/libmysql.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamdef.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/case.result: Auto merged mysql-test/r/distinct.result: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/key_diff.result: Auto merged mysql-test/r/multi_update.result: Auto merged mysql-test/r/order_by.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/t/multi_update.test: Auto merged mysql-test/t/rpl_log_pos.test: Auto merged mysys/Makefile.am: Auto merged scripts/Makefile.am: Auto merged sql/field.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_myisammrg.cc: Auto merged sql/ha_myisammrg.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_create.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/lex.h: Auto merged sql/log.cc: Auto merged sql/net_serv.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_udf.cc: Auto merged sql/sql_update.cc: Auto merged sql-bench/crash-me.sh: Auto merged sql-bench/server-cfg.sh: Auto merged sql/share/english/errmsg.txt: Auto merged sql/structs.h: Auto merged |
||
|
unknown
|
e6783a8785 |
Removed compiler warnings
Fixed wrong variable name for Windows VC++Files/innobase/innobase.dsp: Don't use precompiled headers (doesn't work with samba) VC++Files/myisammrg/myisammrg.dsp: Add missing files VC++Files/mysqlbinlog/mysqlbinlog.dsp: Fixed included paths VC++Files/mysqldemb/mysqldemb.dsp: Don't use precompiled headers (doesn't work with samba) VC++Files/mysqlserver/mysqlserver.dsp: Don't use precompiled headers (doesn't work with samba) VC++Files/sql/mysqld.dsp: Fixed paths innobase/include/univ.i: Removed compiler warning myisammrg/myrg_open.c: Removed compiler warning sql/ha_myisam.cc: Removed compiler warning Fixed wrong (but not dangerous) if statement sql/ha_myisammrg.cc: Removed compiler warning sql/mysqld.cc: Fixed wrong variable name for Windows sql/sql_update.cc: Removed not used label |
||
|
unknown
|
a08b786b09 |
Merge
VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/mysys/mysys.dsp: Auto merged VC++Files/sql/mysqld.dsp: Auto merged client/mysql.cc: Auto merged heap/_check.c: Merge: Fixed DBUG_PRINT() usage |
||
|
unknown
|
40c2e7499b |
Portability fixes to be able to compile MySQL with VC++
VC++Files/client/mysqlclient.dsp: Updated VC++ files for 4.1 VC++Files/libmysql/libmysql.dsp: Updated VC++ files for 4.1 VC++Files/libmysqld/libmysqld.dsp: Updated VC++ files for 4.1 VC++Files/myisam/myisam.dsp: Updated VC++ files for 4.1 VC++Files/mysys/mysys.dsp: Updated VC++ files for 4.1 VC++Files/sql/mysqld.dsp: Updated VC++ files for 4.1 VC++Files/strings/strings.dsp: Updated VC++ files for 4.1 client/mysql.cc: Update for windows heap/_check.c: Fixed wrong DBUG_PRINT() usage include/mysql.h: Portability fix (uint -> unsigned int) libmysql/libmysql.def: Removed old my_casecmp function sql/ha_innodb.cc: Update for windows sql/init.cc: Removed not used variable sql/log.cc: Removed not used variable sql/net_pkg.cc: Portability fix sql/sql_db.cc: Portability fixes. Removed not used variables sql/sql_lex.h: Portability fix sql/sql_parse.cc: Portability fix sql/sql_prepare.cc: Removed not used variables sql/sql_select.cc: Portability fix sql/sql_show.cc: Portability fix sql/sql_union.cc: Portability fix |
||
|
unknown
|
efacfcade0 |
additions for compiling for Win via samba
Docs/bk.txt: instructions for compiling for Win via samba VC++Files/mysqlbinlog/mysqlbinlog.dsp: add some options VC++Files/mysys/mysys.dsp: add some options |
||
|
unknown
|
5b975a555c |
Update for Visual Studio Projects Files
VC++Files/client/mysqlclient.dsp: Updated the sources files: < net.c >net_serv.cpp VC++Files/innobase/innobase.dsp: Added configuration for to compile all the dependencies options for the other projects. VC++Files/libmysql/libmysql.dsp: Modified the xcopy command for to avoid an error for waiting the confirmation of the copy VC++Files/myisampack/myisampack.dsp: Updated source location VC++Files/mysql.dsw: Added project files: the embedded static library; my_print_defaults; comp_err VC++Files/mysqldemb/mysqldemb.dsp: Updated flags VC++Files/mysqlserver/mysqlserver.dsp: Updated flags VC++Files/pack_isam/pack_isam.dsp: Updated source location VC++Files/sql/mysqld.dsp: Added UDF and updated flags BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted |
||
|
unknown
|
c245f4244b |
Updated VC++ project files for 4.0.4
Only write short usage if one starts mysqldump without any options Added query cache on windows Added error message if one can't read privilege tables Docs/manual.texi: Changelog VC++Files/bdb/bdb.dsp: Updated project files for 4.0.4 VC++Files/client/mysqlclient.dsp: Updated project files for 4.0.4 VC++Files/innobase/innobase.dsp: Updated project files for 4.0.4 VC++Files/mysqlbinlog/mysqlbinlog.dsp: Updated project files for 4.0.4 VC++Files/mysys/mysys.dsp: Updated project files for 4.0.4 VC++Files/perror/perror.dsp: Updated project files for 4.0.4 VC++Files/sql/mysqld.dsp: Updated project files for 4.0.4 client/mysqldump.c: Only write short usage if one starts mysqldump without any options include/config-win.h: Added query cache on windows libmysql/libmysql.def: Removed old depricated functions from windows dll sql/ha_innodb.cc: Added missing defines sql/set_var.cc: Code cleanup sql/sql_acl.cc: Added error message if one can't read privilege tables sql/sql_cache.h: Changed some C linkage functions to C++ functions (portability fix) sql/sql_class.cc: Safety fix |
||
|
unknown
|
77e2894286 |
Updated VC++ dsp files from windows build machine
Remove some compiler warnings when using VC++ Add InnoDB in normal MySQL binary for windows. BitKeeper/deleted/.del-lib_load.cc~854092828128d7f9: Delete: libmysqld/lib_load.cc VC++Files/bdb/bdb.dsp: Updated VC++ dsp files from windows build machine VC++Files/client/mysql.dsp: Updated VC++ dsp files from windows build machine VC++Files/client/mysqladmin.dsp: Updated VC++ dsp files from windows build machine VC++Files/client/mysqlclient.dsp: Updated VC++ dsp files from windows build machine VC++Files/client/mysqldump.dsp: Updated VC++ dsp files from windows build machine VC++Files/client/mysqlimport.dsp: Updated VC++ dsp files from windows build machine VC++Files/client/mysqlshow.dsp: Updated VC++ dsp files from windows build machine VC++Files/innobase/innobase.dsp: Updated VC++ dsp files from windows build machine VC++Files/libmysqld/libmysqld.dsp: Updated VC++ dsp files from windows build machine VC++Files/libmysqltest/myTest.dsp: Updated VC++ dsp files from windows build machine VC++Files/libmysqltest/mytest.c: Removed compiler warning for VC++ VC++Files/mysql.dsw: Add Innodb to standard binary VC++Files/mysqlbinlog/mysqlbinlog.dsp: Updated VC++ dsp files from windows build machine VC++Files/mysqlcheck/mysqlcheck.dsp: Updated VC++ dsp files from windows build machine VC++Files/mysqlmanager/MySqlManager.dsp: Updated VC++ dsp files from windows build machine VC++Files/mysys/mysys.dsp: Updated VC++ dsp files from windows build machine VC++Files/pack_isam/pack_isam.dsp: Updated VC++ dsp files from windows build machine VC++Files/perror/perror.dsp: Updated VC++ dsp files from windows build machine VC++Files/replace/replace.dsp: Updated VC++ dsp files from windows build machine VC++Files/sql/mysqld.dsp: Updated VC++ dsp files from windows build machine VC++Files/test1/test1.dsp: Updated VC++ dsp files from windows build machine VC++Files/thr_insert_test/thr_insert_test.dsp: Updated VC++ dsp files from windows build machine VC++Files/thr_test/thr_test.dsp: Updated VC++ dsp files from windows build machine VC++Files/vio/vio.dsp: Updated VC++ dsp files from windows build machine sql/item_strfunc.cc: Removed compiler warning on VC++ VC++Files/libmysql/libmysql.dsp: Updated VC++ dsp files from windows build machine |
||
|
unknown
|
7139794e29 |
merge with 3.23.53
New fix for pthread_mutex_trylock for HPUX 10.20 BitKeeper/deleted/.del-mysql.dsp: Delete: VC++Files/mysql.dsp BitKeeper/deleted/.del-mysqlshow.dsp: Delete: VC++Files/client/mysqlshow.dsp BitKeeper/deleted/.del-dbug.dsp: Delete: VC++Files/dbug/dbug.dsp BitKeeper/deleted/.del-dbug.dsw: Delete: VC++Files/dbug/dbug.dsw BitKeeper/deleted/.del-heap.dsp: Delete: VC++Files/heap/heap.dsp BitKeeper/deleted/.del-innobase.dsp: Delete: VC++Files/innobase/innobase.dsp BitKeeper/deleted/.del-isam.dsp: Delete: VC++Files/isam/isam.dsp BitKeeper/deleted/.del-isam.dsw: Delete: VC++Files/isam/isam.dsw BitKeeper/deleted/.del-isamchk.dsp: Delete: VC++Files/isamchk/isamchk.dsp BitKeeper/deleted/.del-libmySQL.dsp: Delete: VC++Files/libmysql/libmySQL.dsp BitKeeper/deleted/.del-libmysql.dsw: Delete: VC++Files/libmysql/libmysql.dsw BitKeeper/deleted/.del-mysql.dsw: Delete: VC++Files/mysql.dsw BitKeeper/deleted/.del-myTest.dsp: Delete: VC++Files/libmysqltest/myTest.dsp BitKeeper/deleted/.del-mytest.dsw: Delete: VC++Files/libmysqltest/mytest.dsw BitKeeper/deleted/.del-merge.dsp: Delete: VC++Files/merge/merge.dsp BitKeeper/deleted/.del-merge.dsw: Delete: VC++Files/merge/merge.dsw BitKeeper/deleted/.del-myisam.dsp: Delete: VC++Files/myisam/myisam.dsp BitKeeper/deleted/.del-myisamchk.dsp: Delete: VC++Files/myisamchk/myisamchk.dsp BitKeeper/deleted/.del-myisamlog.dsp: Delete: VC++Files/myisamlog/myisamlog.dsp BitKeeper/deleted/.del-myisammrg.dsp: Delete: VC++Files/myisammrg/myisammrg.dsp BitKeeper/deleted/.del-myisampack.dsp: Delete: VC++Files/myisampack/myisampack.dsp BitKeeper/deleted/.del-mysqlbinlog.dsp: Delete: VC++Files/mysqlbinlog/mysqlbinlog.dsp BitKeeper/deleted/.del-bdb.dsp: Delete: VC++Files/bdb/bdb.dsp BitKeeper/deleted/.del-MySqlManager.dsp: Delete: VC++Files/mysqlmanager/MySqlManager.dsp BitKeeper/deleted/.del-mysqlmanager.dsw: Delete: VC++Files/mysqlmanager/mysqlmanager.dsw BitKeeper/deleted/.del-myshutdown.dsp: Delete: VC++Files/mysqlshutdown/myshutdown.dsp BitKeeper/deleted/.del-mysqlshutdown.dsp: Delete: VC++Files/mysqlshutdown/mysqlshutdown.dsp BitKeeper/deleted/.del-mysqlwatch.dsp: Delete: VC++Files/mysqlwatch/mysqlwatch.dsp BitKeeper/deleted/.del-mysys.dsp: Delete: VC++Files/mysys/mysys.dsp BitKeeper/deleted/.del-mysys.dsw: Delete: VC++Files/mysys/mysys.dsw BitKeeper/deleted/.del-pack_isam.dsp: Delete: VC++Files/pack_isam/pack_isam.dsp BitKeeper/deleted/.del-perror.dsp: Delete: VC++Files/perror/perror.dsp BitKeeper/deleted/.del-regex.dsp: Delete: VC++Files/regex/regex.dsp BitKeeper/deleted/.del-mysql.dsp~1: Delete: VC++Files/client/mysql.dsp BitKeeper/deleted/.del-regex.dsw: Delete: VC++Files/regex/regex.dsw BitKeeper/deleted/.del-replace.dsp: Delete: VC++Files/replace/replace.dsp BitKeeper/deleted/.del-mysqld.dsp: Delete: VC++Files/sql/mysqld.dsp BitKeeper/deleted/.del-mysqldmax.dsp: Delete: VC++Files/sql/mysqldmax.dsp BitKeeper/deleted/.del-strings.dsp: Delete: VC++Files/strings/noMASM/strings.dsp BitKeeper/deleted/.del-test1.dsp: Delete: VC++Files/test1/test1.dsp BitKeeper/deleted/.del-thr_insert_test.dsp: Delete: VC++Files/thr_insert_test/thr_insert_test.dsp BitKeeper/deleted/.del-thr_test.dsp: Delete: VC++Files/thr_test/thr_test.dsp BitKeeper/deleted/.del-zlib.dsp~1: Delete: VC++Files/zlib/zlib.dsp BitKeeper/deleted/.del-mysqladmin.dsp: Delete: VC++Files/client/mysqladmin.dsp BitKeeper/deleted/.del-mysqlclient.dsp: Delete: VC++Files/client/mysqlclient.dsp BitKeeper/deleted/.del-mysqlclient.dsw: Delete: VC++Files/client/mysqlclient.dsw BitKeeper/deleted/.del-mysqldump.dsp: Delete: VC++Files/client/mysqldump.dsp BitKeeper/deleted/.del-global.h~e80d28157acfdcb5: Auto merged BitKeeper/deleted/.del-mysqlimport.dsp: Delete: VC++Files/client/mysqlimport.dsp Docs/manual.texi: Auto merged configure.in: merge mysys/my_pthread.c: New fix for pthread_mutex_trylock for HPUX sql-bench/Makefile.am: merge with 3.23.53 |
||
|
unknown
|
4b499a870c | Added the last VC++ workspace and project files | ||
|
unknown
|
7311cbe7de |
Updated windows files (VC++ files and winmysqladmin).
Portability fixes. Removed compiler warnings. VC++Files/client/mysql.dsp: Updated to 4.0.2 VC++Files/client/mysqladmin.dsp: Updated to 4.0.2 VC++Files/client/mysqlclient.dsp: Updated to 4.0.2 VC++Files/client/mysqldump.dsp: Updated to 4.0.2 VC++Files/client/mysqlimport.dsp: Updated to 4.0.2 VC++Files/client/mysqlshow.dsp: Updated to 4.0.2 VC++Files/innobase/innobase.dsp: Updated to 4.0.2 VC++Files/libmysql/libmySQL.dsp: Updated to 4.0.2 VC++Files/libmysqltest/myTest.dsp: Updated to 4.0.2 VC++Files/merge/merge.dsp: Updated to 4.0.2 VC++Files/myisam/myisam.dsp: Updated to 4.0.2 VC++Files/mysql.dsw: Updated to 4.0.2 VC++Files/mysqlbinlog/mysqlbinlog.dsp: Updated to 4.0.2 VC++Files/mysqlcheck/mysqlcheck.dsp: Updated to 4.0.2 VC++Files/mysqlmanager/MySqlManager.dsp: Updated to 4.0.2 VC++Files/mysys/mysys.dsp: Updated to 4.0.2 VC++Files/pack_isam/pack_isam.dsp: Updated to 4.0.2 VC++Files/perror/perror.dsp: Updated to 4.0.2 VC++Files/replace/replace.dsp: Updated to 4.0.2 VC++Files/sql/mysqld.dsp: Updated to 4.0.2 VC++Files/test1/test1.dsp: Updated to 4.0.2 VC++Files/thr_insert_test/thr_insert_test.dsp: Updated to 4.0.2 VC++Files/thr_test/thr_test.dsp: Updated to 4.0.2 VC++Files/vio/vio.dsp: Updated to 4.0.2 VC++Files/zlib/zlib.dsp: Updated to 4.0.2 include/config-win.h: Added isnan() and finite() include/myisam.h: Move thr_xxx functions to myisam_priv.h myisam/mi_check.c: Portability fix. myisam/mi_locking.c: Comment cleanup myisam/myisamchk.c: Removed compiler warning myisam/myisamdef.h: Added thr_xxx functions myisam/sort.c: Portability fix sql/field.cc: Portability fix sql/sql_insert.cc: R |
||
|
unknown
|
4992b3a211 | Remove console manager and deprecate functions from libmysql | ||
|
unknown
|
fe2be67362 |
Adding Win32 IDE Stuff
-WorkSpace and Project Files for VC++6.0 -InstallShield Files for setup program. |