mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 22:12:30 +01:00
26 commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
unknown
|
0892c0f5fe | Windows/Visual Studio 2003 fixes for the 5.1.5 release. | ||
|
unknown
|
29805bab61 |
Many files:
Enable build on Windows VC++Files/mysql.sln: Enable build on Windows VC++Files/libmysqld/libmysqld.vcproj: Enable build on Windows VC++Files/myisam_ftdump/myisam_ftdump.vcproj: Enable build on Windows VC++Files/myisamchk/myisamchk.vcproj: Enable build on Windows VC++Files/myisamlog/myisamlog.vcproj: Enable build on Windows VC++Files/myisampack/myisampack.vcproj: Enable build on Windows VC++Files/mysqldemb/mysqldemb.vcproj: Enable build on Windows VC++Files/mysqlserver/mysqlserver.vcproj: Enable build on Windows VC++Files/sql/mysqld.vcproj: Enable build on Windows VC++Files/storage/bdb/bdb.vcproj: Enable build on Windows VC++Files/storage/myisam/myisam.vcproj: Enable build on Windows VC++Files/storage/myisammrg/myisammrg.vcproj: Enable build on Windows VC++Files/strings/strings.vcproj: Enable build on Windows |
||
|
unknown
|
030558e17e | Fix VS project files following move of storage engines below storage/. | ||
|
unknown
|
f3c622356f |
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release BUILD/SETUP.sh: Auto merged client/mysql.cc: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/mysqldump.test: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/des_key_file.cc: Auto merged |
||
|
unknown
|
2477092651 |
Removed all Visual Studio .Net .vcproj files to be able to
back-port to 4.1 and merge forward to 5.x again properly. BitKeeper/deleted/.del-bdb.vcproj~ed8534936e40cefb: Delete: VC++Files/bdb/bdb.vcproj BitKeeper/deleted/.del-mysql.vcproj~f542eaa36b79459d: Delete: VC++Files/client/mysql.vcproj BitKeeper/deleted/.del-mysqladmin.vcproj~4735738126ddd45f: Delete: VC++Files/client/mysqladmin.vcproj BitKeeper/deleted/.del-mysqlclient.vcproj~4e8fd6c239c455e7: Delete: VC++Files/client/mysqlclient.vcproj BitKeeper/deleted/.del-mysqldump.vcproj~72e1d52e8264ee24: Delete: VC++Files/client/mysqldump.vcproj BitKeeper/deleted/.del-mysqlimport.vcproj~f3413e59c84590a6: Delete: VC++Files/client/mysqlimport.vcproj BitKeeper/deleted/.del-mysqlshow.vcproj~89671830c737ad67: Delete: VC++Files/client/mysqlshow.vcproj BitKeeper/deleted/.del-comp_err.vcproj~43c2674631ff6dcd: Delete: VC++Files/comp_err/comp_err.vcproj BitKeeper/deleted/.del-dbug.vcproj~cec9ed672efe1999: Delete: VC++Files/dbug/dbug.vcproj BitKeeper/deleted/.del-heap.vcproj~70c0cc1d680a51c1: Delete: VC++Files/heap/heap.vcproj BitKeeper/deleted/.del-innobase.vcproj~71e1de81f11138bf: Delete: VC++Files/innobase/innobase.vcproj BitKeeper/deleted/.del-mysqltest.vcproj~bba9139c2e68286a: Delete: VC++Files/client/mysqltest.vcproj BitKeeper/deleted/.del-libmysql.vcproj~76b7601f350cd80c: Delete: VC++Files/libmysql/libmysql.vcproj BitKeeper/deleted/.del-libmysqld.vcproj~a1d46f8635014df2: Delete: VC++Files/libmysqld/libmysqld.vcproj BitKeeper/deleted/.del-myTest.vcproj~9dcbfc99784da76d: Delete: VC++Files/libmysqltest/myTest.vcproj BitKeeper/deleted/.del-my_print_defaults.vcproj~805e02c029c13a3d: Delete: VC++Files/my_print_defaults/my_print_defaults.vcproj BitKeeper/deleted/.del-test_libmysqld.vcproj~8ff2f936c65b4814: Delete: VC++Files/libmysqld/examples/test_libmysqld.vcproj BitKeeper/deleted/.del-myisam.vcproj~32bb9e4a163fcb5a: Delete: VC++Files/myisam/myisam.vcproj BitKeeper/deleted/.del-myisam_ftdump.vcproj~cf156af17f00e691: Delete: VC++Files/myisam_ftdump/myisam_ftdump.vcproj BitKeeper/deleted/.del-myisamchk.vcproj~ca51391a749b5066: Delete: VC++Files/myisamchk/myisamchk.vcproj BitKeeper/deleted/.del-myisamlog.vcproj~b642178bf2a443e: Delete: VC++Files/myisamlog/myisamlog.vcproj BitKeeper/deleted/.del-myisammrg.vcproj~6534e59acbfbb63: Delete: VC++Files/myisammrg/myisammrg.vcproj BitKeeper/deleted/.del-myisampack.vcproj~3df8a31f3b603a8: Delete: VC++Files/myisampack/myisampack.vcproj BitKeeper/deleted/.del-mysql.sln~f2120278f8a437be: Delete: VC++Files/mysql.sln BitKeeper/deleted/.del-mysql_test_run_new.vcproj~c953b417c83523a0: Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj BitKeeper/deleted/.del-mysqlbinlog.vcproj~d3fd2c6ed118cd99: Delete: VC++Files/mysqlbinlog/mysqlbinlog.vcproj BitKeeper/deleted/.del-mysqlcheck.vcproj~562fe5a45c9337df: Delete: VC++Files/mysqlcheck/mysqlcheck.vcproj BitKeeper/deleted/.del-mysqldemb.vcproj~a3e9e254c6b572ff: Delete: VC++Files/mysqldemb/mysqldemb.vcproj BitKeeper/deleted/.del-mysqlserver.vcproj~31349c409587c097: Delete: VC++Files/mysqlserver/mysqlserver.vcproj BitKeeper/deleted/.del-mysys.vcproj~6be390f26fc5539a: Delete: VC++Files/mysys/mysys.vcproj BitKeeper/deleted/.del-perror.vcproj~622c06abaff48379: Delete: VC++Files/perror/perror.vcproj BitKeeper/deleted/.del-regex.vcproj~9dfe1e8c7395a8e5: Delete: VC++Files/regex/regex.vcproj BitKeeper/deleted/.del-replace.vcproj~921ddc8d8383ffc6: Delete: VC++Files/replace/replace.vcproj BitKeeper/deleted/.del-mysql_client_test.vcproj~624117036ff1d17c: Delete: VC++Files/tests/mysql_client_test.vcproj BitKeeper/deleted/.del-mysqld.vcproj~703886a28862bb2: Delete: VC++Files/sql/mysqld.vcproj BitKeeper/deleted/.del-strings.vcproj~62578a38fd9e976: Delete: VC++Files/strings/strings.vcproj BitKeeper/deleted/.del-test1.vcproj~f47ec733f5da69d5: Delete: VC++Files/test1/test1.vcproj BitKeeper/deleted/.del-thr_test.vcproj~f5b31bfbc5366334: Delete: VC++Files/thr_test/thr_test.vcproj BitKeeper/deleted/.del-dummy.cpp~d1d2a28e28f91f20: Delete: VC++Files/mysqlserver/dummy.cpp BitKeeper/deleted/.del-vio.vcproj~f575b4666be84569: Delete: VC++Files/vio/vio.vcproj BitKeeper/deleted/.del-zlib.vcproj~997ad815f1f4b73: Delete: VC++Files/zlib/zlib.vcproj |
||
|
unknown
|
b446550e2c |
Many files:
New VC7 project files des_key_file.cc: Visual C++ wants '"' for local include mysql.cc: Cast my_cgets() argument for VC6 and VC7 dummy.cpp: Added to convince VS .Net generate a lib for mysqlserver VC++Files/mysqlserver/dummy.cpp: Added to convince VS .Net generate a lib for mysqlserver VC++Files/bdb/bdb.vcproj: New VC7 project files VC++Files/client/mysql.vcproj: New VC7 project files VC++Files/client/mysqladmin.vcproj: New VC7 project files VC++Files/client/mysqlclient.vcproj: New VC7 project files VC++Files/client/mysqldump.vcproj: New VC7 project files VC++Files/client/mysqlimport.vcproj: New VC7 project files VC++Files/client/mysqlshow.vcproj: New VC7 project files VC++Files/client/mysqltest.vcproj: New VC7 project files VC++Files/comp_err/comp_err.vcproj: New VC7 project files VC++Files/dbug/dbug.vcproj: New VC7 project files VC++Files/heap/heap.vcproj: New VC7 project files VC++Files/innobase/innobase.vcproj: New VC7 project files VC++Files/libmysql/libmysql.vcproj: New VC7 project files VC++Files/libmysqld/examples/test_libmysqld.vcproj: New VC7 project files VC++Files/libmysqld/libmysqld.vcproj: New VC7 project files VC++Files/libmysqltest/myTest.vcproj: New VC7 project files VC++Files/my_print_defaults/my_print_defaults.vcproj: New VC7 project files VC++Files/myisam/myisam.vcproj: New VC7 project files VC++Files/myisam_ftdump/myisam_ftdump.vcproj: New VC7 project files VC++Files/myisamchk/myisamchk.vcproj: New VC7 project files VC++Files/myisamlog/myisamlog.vcproj: New VC7 project files VC++Files/myisammrg/myisammrg.vcproj: New VC7 project files VC++Files/myisampack/myisampack.vcproj: New VC7 project files VC++Files/mysql-test/mysql_test_run_new.vcproj: New VC7 project files VC++Files/mysql.sln: New VC7 project files VC++Files/mysqlbinlog/mysqlbinlog.vcproj: New VC7 project files VC++Files/mysqlcheck/mysqlcheck.vcproj: New VC7 project files VC++Files/mysqldemb/mysqldemb.vcproj: New VC7 project files VC++Files/mysqlserver/mysqlserver.vcproj: New VC7 project files VC++Files/mysys/mysys.vcproj: New VC7 project files VC++Files/perror/perror.vcproj: New VC7 project files VC++Files/regex/regex.vcproj: New VC7 project files VC++Files/replace/replace.vcproj: New VC7 project files VC++Files/sql/mysqld.vcproj: New VC7 project files VC++Files/strings/strings.vcproj: New VC7 project files VC++Files/test1/test1.vcproj: New VC7 project files VC++Files/tests/mysql_client_test.vcproj: New VC7 project files VC++Files/thr_test/thr_test.vcproj: New VC7 project files VC++Files/vio/vio.vcproj: New VC7 project files VC++Files/zlib/zlib.vcproj: New VC7 project files client/mysql.cc: Cast my_cgets() argument for VC6 and VC7 sql/des_key_file.cc: Visual C++ wants '"' for local include scripts/make_win_src_distribution.sh: New VC7 project files |
||
|
unknown
|
d67bd2104c |
Conversions of dsp files to vcproj. These files are compatible with
Visual Studio 2003. I have not yet changed the windows build scripts to use these. VC++Files/bdb/bdb.vcproj: New BitKeeper file ``VC++Files/bdb/bdb.vcproj'' VC++Files/client/mysql.vcproj: New BitKeeper file ``VC++Files/client/mysql.vcproj'' VC++Files/client/mysqladmin.vcproj: New BitKeeper file ``VC++Files/client/mysqladmin.vcproj'' VC++Files/client/mysqlclient.vcproj: New BitKeeper file ``VC++Files/client/mysqlclient.vcproj'' VC++Files/client/mysqldump.vcproj: New BitKeeper file ``VC++Files/client/mysqldump.vcproj'' VC++Files/client/mysqlimport.vcproj: New BitKeeper file ``VC++Files/client/mysqlimport.vcproj'' VC++Files/client/mysqlshow.vcproj: New BitKeeper file ``VC++Files/client/mysqlshow.vcproj'' VC++Files/client/mysqltest.vcproj: New BitKeeper file ``VC++Files/client/mysqltest.vcproj'' VC++Files/comp_err/comp_err.vcproj: New BitKeeper file ``VC++Files/comp_err/comp_err.vcproj'' VC++Files/dbug/dbug.vcproj: New BitKeeper file ``VC++Files/dbug/dbug.vcproj'' VC++Files/heap/heap.vcproj: New BitKeeper file ``VC++Files/heap/heap.vcproj'' VC++Files/innobase/innobase.vcproj: New BitKeeper file ``VC++Files/innobase/innobase.vcproj'' VC++Files/libmysql/libmysql.vcproj: New BitKeeper file ``VC++Files/libmysql/libmysql.vcproj'' VC++Files/libmysqld/examples/test_libmysqld.vcproj: New BitKeeper file ``VC++Files/libmysqld/examples/test_libmysqld.vcproj'' VC++Files/libmysqld/libmysqld.vcproj: New BitKeeper file ``VC++Files/libmysqld/libmysqld.vcproj'' VC++Files/libmysqltest/myTest.vcproj: New BitKeeper file ``VC++Files/libmysqltest/myTest.vcproj'' VC++Files/my_print_defaults/my_print_defaults.vcproj: New BitKeeper file ``VC++Files/my_print_defaults/my_print_defaults.vcproj'' VC++Files/myisam/myisam.vcproj: New BitKeeper file ``VC++Files/myisam/myisam.vcproj'' VC++Files/myisam_ftdump/myisam_ftdump.vcproj: New BitKeeper file ``VC++Files/myisam_ftdump/myisam_ftdump.vcproj'' VC++Files/myisamchk/myisamchk.vcproj: New BitKeeper file ``VC++Files/myisamchk/myisamchk.vcproj'' VC++Files/myisamlog/myisamlog.vcproj: New BitKeeper file ``VC++Files/myisamlog/myisamlog.vcproj'' VC++Files/myisammrg/myisammrg.vcproj: New BitKeeper file ``VC++Files/myisammrg/myisammrg.vcproj'' VC++Files/myisampack/myisampack.vcproj: New BitKeeper file ``VC++Files/myisampack/myisampack.vcproj'' VC++Files/mysql-test/mysql_test_run_new.vcproj: New BitKeeper file ``VC++Files/mysql-test/mysql_test_run_new.vcproj'' VC++Files/mysql.sln: New BitKeeper file ``VC++Files/mysql.sln'' VC++Files/mysqlbinlog/mysqlbinlog.vcproj: New BitKeeper file ``VC++Files/mysqlbinlog/mysqlbinlog.vcproj'' VC++Files/mysqlcheck/mysqlcheck.vcproj: New BitKeeper file ``VC++Files/mysqlcheck/mysqlcheck.vcproj'' VC++Files/mysqldemb/mysqldemb.vcproj: New BitKeeper file ``VC++Files/mysqldemb/mysqldemb.vcproj'' VC++Files/mysqlserver/mysqlserver.vcproj: New BitKeeper file ``VC++Files/mysqlserver/mysqlserver.vcproj'' VC++Files/mysys/mysys.vcproj: New BitKeeper file ``VC++Files/mysys/mysys.vcproj'' VC++Files/perror/perror.vcproj: New BitKeeper file ``VC++Files/perror/perror.vcproj'' VC++Files/regex/regex.vcproj: New BitKeeper file ``VC++Files/regex/regex.vcproj'' VC++Files/replace/replace.vcproj: New BitKeeper file ``VC++Files/replace/replace.vcproj'' VC++Files/sql/mysqld.vcproj: New BitKeeper file ``VC++Files/sql/mysqld.vcproj'' VC++Files/strings/strings.vcproj: New BitKeeper file ``VC++Files/strings/strings.vcproj'' VC++Files/test1/test1.vcproj: New BitKeeper file ``VC++Files/test1/test1.vcproj'' VC++Files/tests/mysql_client_test.vcproj: New BitKeeper file ``VC++Files/tests/mysql_client_test.vcproj'' VC++Files/thr_test/thr_test.vcproj: New BitKeeper file ``VC++Files/thr_test/thr_test.vcproj'' VC++Files/vio/vio.vcproj: New BitKeeper file ``VC++Files/vio/vio.vcproj'' VC++Files/zlib/zlib.vcproj: New BitKeeper file ``VC++Files/zlib/zlib.vcproj'' extra/yassl/taocrypt/taocrypt.vcproj: New BitKeeper file ``extra/yassl/taocrypt/taocrypt.vcproj'' extra/yassl/yassl.vcproj: New BitKeeper file ``extra/yassl/yassl.vcproj'' |
||
|
unknown
|
48577bb59f |
merged
BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union Build-tools/Do-compile: Auto merged client/mysql.cc: Auto merged client/mysqldump.c: Auto merged include/my_sys.h: Auto merged innobase/buf/buf0lru.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/include/page0page.ic: Auto merged innobase/include/srv0srv.h: Auto merged innobase/os/os0thread.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/trx/trx0sys.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/ut/ut0ut.c: Auto merged myisam/ft_parser.c: Auto merged myisam/mi_create.c: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/ndb_alter_table.result: Auto merged mysql-test/t/mysqldump.test: Auto merged mysql-test/t/ndb_alter_table.test: Auto merged mysys/hash.c: Auto merged mysys/my_bitmap.c: Auto merged ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/net_serv.cc: Auto merged sql/sql_select.cc: Auto merged |
||
|
unknown
|
ae81d53048 |
New Project files for Windows Ithanium 64-bit builds
BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted |
||
|
unknown
|
86016aeb45 |
Fixes for windows compilation bugs
(After review of cs georg:1.1800 by Monty) VC++Files/libmysqld/libmysqld.dsp: removed ha_isammrg.cpp (doesn't exist anymore) VC++Files/mysqldemb/mysqldemb.dsp: removed ha_isammrg.cpp (doesn't exist anymore) extra/comp_err.c: renamed DATADIR to DATADIRECTORY (DATADIR is a windows internal enumeration type) innobase/ut/ut0ut.c: gettimeofday is not available under Windows. Added conditional define which uses GetLocalTime for windows libmysql/libmysql.c: fixed prototype for setup_one_fetch_function which differed from function declaration. Fixed not supported unsigned __int64 to double conversion sql/field.h: fixed typecast error (windows) sql/item_sum.cc: fixed typecast errors (windows) sql/key.cc: fixed typecast errors (windows) sql/opt_range.cc: fixed not supported unsigned __int64 to double conversion sql/sql_acl.cc: fixed typecast errors (windows) sql/table.cc: fixed typecast errors (windows) |
||
|
unknown
|
5e0df34b61 | Merge with 4.0 to get fixes for project files | ||
|
unknown
|
b7e8f418c2 |
Removed references to BDB and InnoDB from 'classic' release
VC++Files/mysqldemb/mysqldemb.dsp: Removed references to BDB and InnoDB from 'classic' VC++Files/sql/mysqld.dsp: Removed references to BDB and InnoDB from 'classic' |
||
|
unknown
|
48e39bf299 | fixed typos | ||
|
unknown
|
406a5fa7cd |
After merge fixes
Remove compiler warnings Update windows project files VC++Files/innobase/innobase.dsp: Update project files after merge VC++Files/libmysqld/examples/test_libmysqld.dsp: Update project files after merge VC++Files/libmysqld/libmysqld.dsp: Update project files after merge VC++Files/myisamchk/myisamchk.dsp: Update project files after merge VC++Files/myisamlog/myisamlog.dsp: Update project files after merge VC++Files/myisampack/myisampack.dsp: Update project files after merge VC++Files/mysqldemb/mysqldemb.dsp: Update project files after merge VC++Files/sql/mysqld.dsp: Update project files after merge VC++Files/strings/strings.dsp: Update project files after merge innobase/include/data0data.ic: Fix compiler warning innobase/include/mem0pool.h: Remove reference to not existing variable (after merge fix) innobase/srv/srv0srv.c: Remove reference to not existing variable (after merge fix) libmysqld/libmysqld.def: Add function used by test programs mysql-test/r/func_str.result: After merge fixes mysql-test/r/variables.result: After merge fixes mysql-test/t/variables.test: After merge fixes sql/discover.cc: Remove not used lable sql/opt_range.cc: Removed compiler warnings strings/ctype-tis620.c: After merge fixes |
||
|
unknown
|
1d9fbbe3ce |
Merge with 4.0, mainly to get changes to windows project files
VC++Files/client/mysqladmin.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/dbug/dbug.dsp: 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/isamchk/isamchk.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/mysql.dsw: Auto merged BitKeeper/deleted/.del-sync0ipm.ic~2024167f6418de39: Auto merged VC++Files/libmysqltest/myTest.dsp: Auto merged VC++Files/merge/merge.dsp: Auto merged VC++Files/my_print_defaults/my_print_defaults.dsp: Auto merged VC++Files/myisam/myisam.dsp: Auto merged VC++Files/myisam_ftdump/myisam_ftdump.dsp: Auto merged VC++Files/myisammrg/myisammrg.dsp: Auto merged VC++Files/mysqlbinlog/mysqlbinlog.dsp: Auto merged VC++Files/mysqlcheck/mysqlcheck.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/pack_isam/pack_isam.dsp: Auto merged VC++Files/perror/perror.dsp: Auto merged VC++Files/regex/regex.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 extra/my_print_defaults.c: Auto merged include/m_string.h: Auto merged include/mysql_embed.h: Auto merged include/mysql_version.h.in: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/mem/mem0pool.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/trx/trx0sys.c: Auto merged myisam/myisam_ftdump.c: Auto merged VC++Files/bdb/bdb.dsp: Merge with 4.0 VC++Files/client/mysql.dsp: Merge with 4.0 VC++Files/client/mysqlclient.dsp: Merge with 4.0 VC++Files/comp_err/comp_err.dsp: Merge with 4.0 VC++Files/libmysqld/examples/test_libmysqld.dsp: Merge with 4.0 VC++Files/libmysqld/libmysqld.dsp: Merge with 4.0 VC++Files/myisamchk/myisamchk.dsp: Merge with 4.0 VC++Files/myisamlog/myisamlog.dsp: Merge with 4.0 VC++Files/myisampack/myisampack.dsp: Merge with 4.0 VC++Files/mysqldemb/mysqldemb.dsp: Merge with 4.0 VC++Files/mysqlserver/mysqlserver.dsp: Merge with 4.0 VC++Files/sql/mysqld.dsp: Merge with 4.0 VC++Files/strings/strings.dsp: Merge with 4.0 libmysqld/lib_sql.cc: Merge with 4.0 libmysqld/libmysqld.def: Merge with 4.0 mysql-test/r/func_str.result: Merge with 4.0 mysql-test/r/handler.result: auto mysql-test/r/variables.result: Merge with 4.0 mysql-test/t/func_str.test: auto mysql-test/t/handler.test: auto mysql-test/t/variables.test: Merge with 4.0 scripts/make_win_src_distribution.sh: auto scripts/mysql_install_db.sh: Use original file sql/Makefile.am: Merge with 4.0 sql/ha_innodb.cc: auto sql/item_strfunc.cc: Merge with 4.0 sql/mysql_priv.h: auto sql/mysqld.cc: Merge with 4.0 sql/set_var.cc: Merge with 4.0 sql/slave.cc: auto sql/sql_class.h: auto sql/sql_handler.cc: Merge with 4.0 strings/ctype-tis620.c: Merge with 4.0 |
||
|
unknown
|
2d67f1e0cf |
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
Ensured that all projects compile Removed compiler warnings Better setting of server_version variable. Fix that make_win_src_distribution creates the privilege tables. VC++Files/bdb/bdb.dsp: Small, automatic changes VC++Files/client/mysql.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqladmin.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqlclient.dsp: Removed files that should only be used with mysql command line client VC++Files/client/mysqldump.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqlimport.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqlshow.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/comp_err/comp_err.dsp: Automatic changes VC++Files/dbug/dbug.dsp: Automatic changes VC++Files/heap/heap.dsp: automatic changes VC++Files/innobase/innobase.dsp: Automatic changes VC++Files/isam/isam.dsp: Automatic changes VC++Files/isamchk/isamchk.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/libmysql/libmysql.dsp: Automatic changes VC++Files/libmysqld/examples/test_libmysqld.dsp: Add missing files VC++Files/libmysqld/libmysqld.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/libmysqltest/myTest.dsp: Automatic changes VC++Files/merge/merge.dsp: Automatic changes VC++Files/my_print_defaults/my_print_defaults.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisam/myisam.dsp: automatic changes VC++Files/myisam_ftdump/myisam_ftdump.dsp: automatic changes VC++Files/myisamchk/myisamchk.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisamlog/myisamlog.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisammrg/myisammrg.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisampack/myisampack.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysql.dsw: Automatic changes VC++Files/mysqlbinlog/mysqlbinlog.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysqlcheck/mysqlcheck.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysqldemb/mysqldemb.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysqlserver/mysqlserver.dsp: Automatic changes VC++Files/mysqlshutdown/mysqlshutdown.dsp: Automatic changes VC++Files/mysqlwatch/mysqlwatch.dsp: Automatic changes VC++Files/mysys/mysys.dsp: Automatic changes VC++Files/pack_isam/pack_isam.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/perror/perror.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/regex/regex.dsp: Automatic changes VC++Files/replace/replace.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/sql/mysqld.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/strings/strings.dsp: Removed duplicate code for strnlen VC++Files/test1/test1.dsp: Automatic changes VC++Files/thr_test/thr_test.dsp: Automatic changes VC++Files/vio/vio.dsp: Automatic changes VC++Files/zlib/contrib/asm386/zlibvc.dsp: Automatic changes VC++Files/zlib/zlib.dsp: Automatic changes extra/my_print_defaults.c: Fixed bug in --verbose include/m_string.h: Portability fix include/mysql_embed.h: Better setting of server_version variable include/mysql_version.h.in: Better license text handling innobase/pars/pars0lex.l: Remove compiler warnings innobase/trx/trx0sys.c: Remove compiler warnings libmysqld/lib_sql.cc: Better setting of server_version variable libmysqld/libmysqld.def: Add functions needed for mysql command line client myisam/myisam_ftdump.c: Remove compiler warnings mysys/sha1.c: Remove compiler warnings scripts/make_win_src_distribution.sh: Safety fix scripts/mysql_install_db.sh: Backport from 4.1 to allow make_win_src_distribution create the privilege tables sql/Makefile.am: Add new file mysqld_suffix.h Remove not used file sql_olap.h sql/ha_innodb.cc: Remove not used variable sql/mysqld.cc: Better setting of server_version variable sql/set_var.cc: Fixed bug when showing lower_case_file_system strings/ctype-tis620.c: Remove compiler warnings |
||
|
unknown
|
8d7e0a2894 |
Applied fixes to issues discovered during test builds on Windows.
VC++Files/libmysql/libmysql.dsp: strtod.c is needed to build the library. VC++Files/libmysqld/libmysqld.dsp: Add include directory to resolve problem with including emb_qcache.h, remove opt_ft.cc (no longer in tree). VC++Files/mysqldemb/mysqldemb.dsp: Add include directory to resolve problem with including emb_qcache.h, remove opt_ft.cc (no longer in tree). VC++Files/mysqlserver/mysqlserver.dsp: Add include directory to resolve problem with including emb_qcache.h. VC++Files/strings/MASM6x/strings.dsp: Remove atof.c (no longer in tree) and add strtod.c, needed for the library. VC++Files/strings/noMASM/strings.dsp: Remove atof.c (no longer in tree) and add strtod.c, needed for the library. VC++Files/strings/strings.dsp: Remove atof.c (no longer in tree) and add strtod.c, needed for the library. sql/mysqld.cc: A cast is required to resolve the compile error on Windows (char * is not equivalent to byte *). sql/set_var.cc: A cast is required to resolve the compile error on Windows (char * is not equivalent to byte *). 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
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |