delta/mariadb-git.git - github.com: MariaDB/server.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed number of compiler errors on win32.	unknown	2005-11-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	VC++Files/mysqlbinlog/mysqlbinlog.vcproj: Fixed compiler error for Win32 build. #include "decimal.c" wrere no able to find decimal.c file. sql/ha_innodb.cc: Fixed compiler error for Win32 build. sql/spatial.cc: Fixed compiler error for Win32 build. float8get should be enclosed in {} since it is macro on win32 and might cause unmatching blocks.
*	Hastily fix VC++6 project files to include a new file.	unknown	2005-10-18	2	-0/+8
\|
*	mysql.sln:	unknown	2005-10-15	1	-0/+18
\| \| \| \| \| \| \| \|	Missing yaSSL added to pro-gpl target VC++Files/mysql.sln: Missing yaSSL added to pro-gpl target
*	Merge mysql.com:/data0/mysqldev/my/mysql-5.0	unknown	2005-10-14	13	-3265/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/data0/mysqldev/my/mysql-5.0-release
\| *	.del-mysqlwatch.vcproj~91c7061bceb731ad:	unknown	2005-10-14	13	-3265/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete: VC++Files/mysqlwatch/mysqlwatch.vcproj .del-mysqlshutdown.vcproj~b956e6769cf4fe76: Delete: VC++Files/mysqlshutdown/mysqlshutdown.vcproj .del-pack_isam_ia64.dsp~6172aec32da6de5d: Delete: VC++Files/pack_isam/pack_isam_ia64.dsp .del-pack_isam.vcproj~82b3c430c0c623f2: Delete: VC++Files/pack_isam/pack_isam.vcproj .del-pack_isam.dsp~1f236852e0bcc13d: Delete: VC++Files/pack_isam/pack_isam.dsp .del-isamchk_ia64.dsp~abb473e7d3025305: Delete: VC++Files/isamchk/isamchk_ia64.dsp .del-isamchk.vcproj~19838e6a73320284: Delete: VC++Files/isamchk/isamchk.vcproj .del-isamchk.dsp~6349525f4cf767a4: Delete: VC++Files/isamchk/isamchk.dsp .del-isam_ia64.dsp~e6dffc47e113891: Delete: VC++Files/isam/isam_ia64.dsp .del-isam.vcproj~53282403e12348c3: Delete: VC++Files/isam/isam.vcproj .del-isam.dsw~c64a212cb134161a: Delete: VC++Files/isam/isam.dsw .del-isam.dsp~9c26247a621084bf: Delete: VC++Files/isam/isam.dsp mysql.sln: Removed isam from Visual Studio .Net project files, accidently merged over from 4.1 VC++Files/mysql.sln: Removed isam from Visual Studio .Net project files, accidently merged over from 4.1 BitKeeper/deleted/.del-isam.dsp~9c26247a621084bf: Delete: VC++Files/isam/isam.dsp BitKeeper/deleted/.del-isam.dsw~c64a212cb134161a: Delete: VC++Files/isam/isam.dsw BitKeeper/deleted/.del-isam.vcproj~53282403e12348c3: Delete: VC++Files/isam/isam.vcproj BitKeeper/deleted/.del-isam_ia64.dsp~e6dffc47e113891: Delete: VC++Files/isam/isam_ia64.dsp BitKeeper/deleted/.del-isamchk.dsp~6349525f4cf767a4: Delete: VC++Files/isamchk/isamchk.dsp BitKeeper/deleted/.del-isamchk.vcproj~19838e6a73320284: Delete: VC++Files/isamchk/isamchk.vcproj BitKeeper/deleted/.del-isamchk_ia64.dsp~abb473e7d3025305: Delete: VC++Files/isamchk/isamchk_ia64.dsp BitKeeper/deleted/.del-pack_isam.dsp~1f236852e0bcc13d: Delete: VC++Files/pack_isam/pack_isam.dsp BitKeeper/deleted/.del-pack_isam.vcproj~82b3c430c0c623f2: Delete: VC++Files/pack_isam/pack_isam.vcproj BitKeeper/deleted/.del-pack_isam_ia64.dsp~6172aec32da6de5d: Delete: VC++Files/pack_isam/pack_isam_ia64.dsp BitKeeper/deleted/.del-mysqlshutdown.vcproj~b956e6769cf4fe76: Delete: VC++Files/mysqlshutdown/mysqlshutdown.vcproj BitKeeper/deleted/.del-mysqlwatch.vcproj~91c7061bceb731ad: Delete: VC++Files/mysqlwatch/mysqlwatch.vcproj
* \|	Fixed compile errors on windows	unknown	2005-10-14	2	-2/+2
\|/ \| \| \| \| \| \| \| \| \|	VC++Files/test1/mysql_thr.c: Fixed typo VC++Files/thr_test/thr_test.c: Fixed typo sql/log_event.cc: Removed compiler warning Fixed compile error on windows
*	Merge	unknown	2005-10-13	6	-27/+2453
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	VC++Files/mysql.sln: Auto merged mysql-test/t/func_group.test: Auto merged
\| *	mysqlwatch.vcproj:	unknown	2005-10-11	2	-47/+261
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed Debug target not used mysql.sln: Added pro-gpl target Build mysqlwatch and mysqlshutdown for classic as well VC++Files/mysql.sln: Added pro-gpl target VC++Files/mysqlwatch/mysqlwatch.vcproj: Removed Debug target not used
\| *	Many files:	unknown	2005-10-11	6	-0/+2212
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added Visual Studio .Net targets and 'vcproj' files for "isam", "isamchk", "mysqlshutdown", "mysqlwatch" and "pack_isam" VC++Files/mysql.sln: Added isam, isamchk, mysqlshutdown, mysqlwatch and pack_isam VC++Files/isam/isam.vcproj: Added isam, isamchk, mysqlshutdown, mysqlwatch and pack_isam VC++Files/isamchk/isamchk.vcproj: Added isam, isamchk, mysqlshutdown, mysqlwatch and pack_isam VC++Files/mysqlshutdown/mysqlshutdown.vcproj: Added isam, isamchk, mysqlshutdown, mysqlwatch and pack_isam VC++Files/mysqlwatch/mysqlwatch.vcproj: Added isam, isamchk, mysqlshutdown, mysqlwatch and pack_isam VC++Files/pack_isam/pack_isam.vcproj: Added isam, isamchk, mysqlshutdown, mysqlwatch and pack_isam
* \|	Remove protocol_cursor.cpp (no longer used) from sources	unknown	2005-10-09	2	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a compile failure BitKeeper/deleted/.del-protocol_cursor.cc~2a1ab8e023a166a4: Delete: sql/protocol_cursor.cc VC++Files/libmysqld/libmysqld.dsp: Remove protocol_cursor.cpp (no longer used) from sources VC++Files/sql/mysqld.dsp: Remove protocol_cursor.cpp (no longer used) from sources sql/mysqld.cc: Fix a compile failure
* \|	pthread_handler_decl() changed to be ctags-friendly	unknown	2005-10-08	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	(and contain extern "C" when necessary)
* \|	mysqld.vcproj:	unknown	2005-10-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed "examples/" from path to "ha_archive.cc" VC++Files/sql/mysqld.vcproj: Removed "examples/" from path to "ha_archive.cc"
* \|	Many files:	unknown	2005-09-30	7	-69/+1528
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert back 5.0 changes to Visual Studio .Net project files VC++Files/client/mysqlclient.vcproj: Revert back 5.0 changes to Visual Studio .Net project files VC++Files/libmysql/libmysql.vcproj: Revert back 5.0 changes to Visual Studio .Net project files VC++Files/libmysqld/libmysqld.vcproj: Revert back 5.0 changes to Visual Studio .Net project files VC++Files/mysql.sln: Revert back 5.0 changes to Visual Studio .Net project files VC++Files/mysys/mysys.vcproj: Revert back 5.0 changes to Visual Studio .Net project files VC++Files/sql/mysqld.vcproj: Revert back 5.0 changes to Visual Studio .Net project files VC++Files/strings/strings.vcproj: Revert back 5.0 changes to Visual Studio .Net project files
* \|	Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1	unknown	2005-09-30	41	-0/+43792
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Many files:	unknown	2005-09-30	41	-0/+43792
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \|	Removed all Visual Studio .Net .vcproj files to be able to	unknown	2005-09-30	41	-45208/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \|	Merge mysqldev@production.mysql.com:my/mysql-5.0-release	unknown	2005-09-23	8	-54/+80
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/opt/local/work/mysql-5.0-root BitKeeper/etc/ignore: auto-union include/my_sys.h: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/t/ctype_ujis.test: Auto merged sql/ha_federated.cc: Auto merged sql/handler.cc: Auto merged sql/item_func.h: Auto merged sql/log.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.h: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_view.cc: Auto merged sql/table.cc: Auto merged
\| * \|	Fixes needed to build 5.0.13 on Windows:	unknown	2005-09-22	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- reflect two "Makefile.am" changes in the respective "VC project" files, - correct a typo in a (normally) unused macro parameter. VC++Files/libmysqld/libmysqld.vcproj: Reflect a change done by Kostja in the Unix "libmysqld/Makefile.am": New file "sql/sql_cursor.cpp" replaces "sql/protocol_cursor.cpp". VC++Files/sql/mysqld.vcproj: Reflect a change done by Kostja in the Unix "sql/Makefile.am": New file "sql/sql_cursor.cpp" replaces "sql/protocol_cursor.cpp". sql/ha_federated.cc: Correct a typo (matters only if "SAFEMALLOC" is set).
\| * \|	More fixes to the VC 7.1 solution and vcproj files	unknown	2005-09-19	3	-29/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	VC++Files/myisamchk/myisamchk.vcproj: removed hard coded library dependencies VC++Files/mysql.sln: more solution fixups VC++Files/tests/mysql_client_test.vcproj: removed hard coded lib dependencies
\| * \|	hopefully final set of changes to the libmysqld targets	unknown	2005-09-16	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	VC++Files/mysql.sln: fixed embedded targets
\| * \|	more fixes to the vcproj build process	unknown	2005-09-16	2	-12/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	VC++Files/libmysqld/libmysqld.vcproj: cleaned up the dependencies on the embedded server VC++Files/mysql.sln: fixed up more of the inter-project dependencies
\| * \|	some last minute Windows compile fixes and makefile corrections	unknown	2005-09-15	5	-10/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	VC++Files/libmysqld/libmysqld.vcproj: don't recall exactly what this change was. VC++Files/libmysqltest/myTest.vcproj: redirect to client_release and client_debug folders VC++Files/mysql.sln: remove bdb from embedded classic target VC++Files/mysqlserver/mysqlserver.vcproj: redirect to lib_release and lib_debug folders server-tools/instance-manager/mysqlmanager.vcproj: redirect to proper folders sql/ha_federated.cc: fix windows compile problems sql/sql_acl.cc: fix windows compile problems sql/table.cc: fix windows compile problems sql/unireg.cc: fix windows compile problems VC++Files/mysqlserver/dummy.cpp: added new file to make mysqlserver generate a lib
* \| \|	merged	unknown	2005-09-21	2	-0/+8
\|\ \ \ \| \|/ / \|/\| / \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	VC++Files/mysys/mysys.dsp: Auto merged VC++Files/mysys/mysys_ia64.dsp: Auto merged client/mysql.cc: Auto merged include/my_sys.h: Auto merged myisam/mi_check.c: Auto merged myisam/myisamchk.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/rpl_multi_delete2.result: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/rpl_multi_delete2-slave.opt: Auto merged mysql-test/t/rpl_multi_delete2.test: Auto merged sql/ha_myisam.cc: Auto merged sql/opt_sum.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged
\| *	Fixes bug #12929. Uses my_cgets instead of _cgets function, thus eliminating	unknown	2005-09-16	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a restriction to 255 chars for editable buffer. VC++Files/mysys/mysys.dsp: Added my_conio.c VC++Files/mysys/mysys_ia64.dsp: Added my_conio.c include/my_sys.h: Added declarations for my_conio.c functions mysys/my_conio.c: Added _cgets() replacement that is not limited to 255 chars retrieval from win32 console.
* \|	A few changes to fix compiling on Windows	unknown	2005-09-06	2	-0/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	VC++Files/mysql.sln: Added instance manager project VC++Files/mysys/mysys.vcproj: Added mf_unixpath.c scripts/make_win_src_distribution.sh: Updated to include server-tools folder (which includes IM) server-tools/instance-manager/instance.cc: fixed typo server-tools/instance-manager/mysqlmanager.vcproj: fixed up all the filenames in the IM project
* \|	Fixes bug #11815. Convert file path to UNIX format to build correct query	unknown	2005-08-30	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	string while replicating LOAD DATA INFILE statement. VC++Files/mysys/mysys.dsp: added mf_unixpath.c into mysys.dsp include/my_sys.h: Added an option for fn_format function to convert path from system representation to UNIX format. mysys/mf_format.c: Added an option for fn_format function to convert path from system representation to UNIX format. sql/log_event.cc: Convert file path to UNIX format to build correct query string while replicating LOAD DATA INFILE statement.
* \|	libmysqld.vcproj:	unknown	2005-08-25	2	-125/+200
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed spelling "Commerical" to "Commercial" mysqld.vcproj: Aligned engines with Unix version sql_class.cc: VC7 needs my_free() cast of first arg to be (gptr) my_global.h: Can't assume macro set_timespec_nsec exists if set_timespec does include/my_global.h: Can't assume macro set_timespec_nsec exists if set_timespec does sql/sql_class.cc: VC7 needs my_free() cast of first arg to be (gptr) VC++Files/sql/mysqld.vcproj: Aligned engines with Unix version VC++Files/libmysqld/libmysqld.vcproj: Changed spelling "Commerical" to "Commercial"
* \|	Merge mishka.local:/home/my/mysql-4.1	unknown	2005-08-25	1	-7/+11
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mishka.local:/home/my/mysql-5.0 BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667: Auto merged BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387: Auto merged BitKeeper/deleted/.del-ctype_cp932.result: Auto merged BitKeeper/deleted/.del-ctype_cp932.test: Auto merged BitKeeper/deleted/.del-have_lowercase0.inc: Delete: mysql-test/include/have_lowercase0.inc VC++Files/mysql-test/mysql_test_run_new.dsp: Auto merged configure.in: Auto merged mysql-test/include/ps_conv.inc: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/ha_innodb.cc: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/examples/ha_archive.cc: Auto merged sql/examples/ha_example.cc: Auto merged sql/sql_table.cc: Auto merged support-files/mysql.spec.sh: Auto merged VC++Files/client/mysqltest.dsp: manual merge VC++Files/sql/mysqld.dsp: manual merge mysql-test/r/grant2.result: patch merge mysql-test/r/subselect2.result: manual merge mysql-test/t/grant2.test: patch merge mysys/charset.c: Remove already deleted function sql/examples/ha_archive.h: Manual merge sql/sql_acl.cc: manual merge sql/sql_db.cc: merge (no differences) sql/sql_select.cc: manual merge sql/table.h: merge (no differences) tests/mysql_client_test.c: patch merge
\| *	mysqld.dsp:	unknown	2005-08-18	3	-17/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added archive and example storage engine to Windows build ha_example.cc, ha_archive.cc: Windows fix, use relative include path to "mysql_priv.h" ha_archive.h: Windows VC6 compile needed (char) cast of byte var mysqltest.dsp, mysql_test_run_new.dsp: Added /FD flag, to avoid include file warnings VC++Files/mysql-test/mysql_test_run_new.dsp: Added /FD flag, to avoid include file warnings VC++Files/client/mysqltest.dsp: Added /FD flag, to avoid include file warnings sql/examples/ha_archive.h: Windows VC6 compile needed (char) cast of byte var sql/examples/ha_archive.cc: Windows fix, use relative include path to "mysql_priv.h" sql/examples/ha_example.cc: Windows fix, use relative include path to "mysql_priv.h" VC++Files/sql/mysqld.dsp: Added archive and example storage engine to Windows build
\| *	mysqld.dsp:	unknown	2005-08-04	1	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added the blackhole storage engine to the Max builds VC++Files/sql/mysqld.dsp: Added the blackhole storage engine to the Max builds
* \|	Some changes to project files	unknown	2005-08-09	3	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	str_alloc had been added but was not added to mysqlclient and strings libmysql should have had strings as a dependent. VC++Files/client/mysqlclient.vcproj: Added missing file VC++Files/mysql.sln: Make libmysql dependendent on strings VC++Files/strings/strings.vcproj: Added missing file
* \|	Merge mysql.com:/home/jimw/my/mysql-5.0-7003	unknown	2005-08-02	10	-1/+42
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-5.0-clean VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/client/mysqlclient_ia64.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/libmysql/libmysql_ia64.dsp: Auto merged VC++Files/libmysqld/libmysqld.dsp: Auto merged libmysql/Makefile.shared: Auto merged sql/mysqld.cc: Auto merged strings/Makefile.am: Auto merged
\| * \|	Add my_str_malloc and _free function pointers to strings library	unknown	2005-06-24	10	-1/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	which will by default exit(1) if malloc() fails, but can be set to do something else by the calling program does, which mysqld does to use my_malloc(..., MYF(MY_FAE)) instead. Also checks allocation in conf_to_src utility program. (Bug #7003) strings/conf_to_src.c: if malloc() fails, just abort VC++Files/client/mysqlclient.dsp: Add str_alloc.c VC++Files/client/mysqlclient_ia64.dsp: Add str_alloc.c VC++Files/libmysql/libmysql.dsp: Add str_alloc.c VC++Files/libmysql/libmysql_ia64.dsp: Add str_alloc.c VC++Files/libmysqld/libmysqld.dsp: Add str_alloc.c VC++Files/libmysqld/libmysqld_ia64.dsp: Add str_alloc.c VC++Files/strings/backup/strings.dsp: Add str_alloc.c VC++Files/strings/noMASM/strings.dsp: Add str_alloc.c VC++Files/strings/strings.dsp: Add str_alloc.c VC++Files/strings/strings_ia64.dsp: Add str_alloc.c include/m_string.h: Add my_str_malloc/free function pointers. libmysql/Makefile.shared: Add str_alloc.lo sql/mysqld.cc: Reassign my_str_malloc/free pointers so they use my_malloc/free strings/Makefile.am: Add str_alloc.c strings/ctype-tis620.c: Use my_str_malloc/free
* \| \|	Conversions of dsp files to vcproj. These files are compatible with	unknown	2005-08-02	40	-0/+45060
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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''
* \| \|	Merge	unknown	2005-07-31	1	-1/+1
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	VC++Files/client/mysqlclient_ia64.dsp: Auto merged include/config-win.h: Auto merged sql/item_sum.cc: SCCS merged
\| * \|	- fixed a typo in C++Files/client/mysqlclient_ia64.dsp: ctype-cp963.c -> ↵	unknown	2005-07-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ctype-cp932.c (thanks to JoergB for spotting it) VC++Files/client/mysqlclient_ia64.dsp: - fixed a typo: ctype-cp963.c -> ctype-cp932.c (thanks to JoergB for spotting it)
* \| \|	Merge deer.(none):/home/hf/work/mysql-4.1.clean	unknown	2005-07-22	1	-1/+1
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into deer.(none):/home/hf/work/mysql-5.0.clean VC++Files/libmysqld/libmysqld.dsp: Auto merged
\| * \|	merging	unknown	2005-07-22	1	-1/+1
\| \|\ \
\| \| * \|	Fix for bug #12042 (User breakpoints calling free() in embedded library)	unknown	2005-07-21	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	VC++Files/libmysqld/libmysqld.dsp: we should have SAFEMALLOC here
\| \| * \|	Adding a file that was missed during the first push	unknown	2004-08-27	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This file was part of the patch for Bug #4466 Nothing in .err when mysql service ends because of malformed my.ini options message.mc: new file
* \| \| \|	Merge bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2005-07-18	6	-24/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mishka.local:/home/my/mysql-5.0 client/mysqldump.c: Auto merged include/my_sys.h: Auto merged mysys/Makefile.am: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged tests/mysql_client_test.c: Auto merged sql/sql_select.cc: Auto merged mysys/default.c: SCCS merged
\| * \| \| \|	Cleanups during review	unknown	2005-07-18	6	-24/+0
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed defaults option --instance to --defaults-group-suffix Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX mysql_print_defaults now understands --defaults-group-suffix Remove usage of my_tempnam() (not safe function) if( -> if ( and while( to while ( BitKeeper/deleted/.del-my_tempnam.c~a8562f15dad3012f: Delete: mysys/my_tempnam.c VC++Files/client/mysqlclient.dsp: Remove not used file my_tempnam.c VC++Files/client/mysqlclient_ia64.dsp: Remove not used file my_tempnam.c VC++Files/libmysql/libmysql.dsp: Remove not used file my_tempnam.c VC++Files/libmysql/libmysql_ia64.dsp: Remove not used file my_tempnam.c VC++Files/mysys/mysys.dsp: Remove not used file my_tempnam.c VC++Files/mysys/mysys_ia64.dsp: Remove not used file my_tempnam.c client/mysql.cc: Change to use get_defaults_options() Remove compiler warnings client/mysqldump.c: Indentation fixes Use quoted table name for 'primary_key_fields' extra/my_print_defaults.c: Add support for --defaults-group-suffix change to use get_default_options() extra/replace.c: Replace my_tempnam() with create_tmp_file() to allow us to remove my_tempnam.c include/config-win.h: Added DEFAULT_GROUP_SUFFIX_ENV include/my_sys.h: Change defaults_instance -> defaults_group_suffix Change get_defaults_files -> get_defaults_options libmysql/Makefile.shared: Added DEFAULT_GROUP_SUFFIX_ENV mysys/Makefile.am: Added DEFAULT_GROUP_SUFFIX_ENV Remove my_tempnam.c mysys/default.c: Changed --instance to --defaults-group-suffix Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX and moved the name to Makefile.am (mysys shouldn't by MySQL independent) Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order mysys/default_modify.c: Optimized code to use allocated space more efficently Reduce code size Ensure that realloc() works independent of argument size mysys/my_bitmap.c: Added missing return sql/ha_innodb.cc: Change if( -> if ( sql/ha_ndbcluster.cc: Change while( -> while ( sql/item_cmpfunc.cc: Break loop early (simple optimization) sql/item_strfunc.cc: Change if( -> if ( sql/log.cc: Fixed comment sql/mysqld.cc: Change if( -> if ( sql/opt_range.cc: while( -> while ( if( -> if ( sql/parse_file.cc: Change if( -> if ( sql/sql_cache.cc: while( -> while ( sql/sql_parse.cc: Change if( -> if ( sql/sql_prepare.cc: Added comment sql/sql_select.cc: while( -> while ( Removed index variable by incrementing pointer sql/sql_show.cc: Change if( -> if ( sql/sql_yacc.yy: Change if( -> if ( tests/mysql_client_test.c: Added cast to first argument to bzero()
* \| \| \|	Merge	unknown	2005-07-13	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/view.result: Auto merged mysql-test/t/view.test: Auto merged
\| * \ \ \	Merge	unknown	2005-07-08	1	-4/+4
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	VC++Files/tests/mysql_client_test.dsp: Merge, and changed to use "Debug\yassl.lib" for debug build
\| \| * \| \|	mysql_client_test.dsp:	unknown	2005-07-08	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Corrected libs and lib search path for debug target VC++Files/tests/mysql_client_test.dsp: Corrected libs and lib search path for debug target
* \| \| \| \|	Merge bk-internal:/home/bk/mysql-5.0	unknown	2005-07-06	1	-4/+4
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-5.0-clean VC++Files/tests/mysql_client_test.dsp: Merge with fix to link debug version against debug yassl library
\| * \| \| \|	Merge	unknown	2005-07-06	1	-4/+4
\| \|\ \ \ \ \| \| \|/ / / \| \| \| / / \| \| \|/ / \| \|/\| \|	mysql-test/mysql-test-run.pl: Auto merged
\| \| * \|	mysql-test-run.pl:	unknown	2005-07-06	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle case where SHELL isn't set in Cygwin mysql_client_test.dsp: Put output into the "client_debug" and "client_release" directories VC++Files/tests/mysql_client_test.dsp: Put output into the "client_debug" and "client_release" directories mysql-test/mysql-test-run.pl: Handle case where SHELL isn't set in Cygwin
\| \| * \|	mysqld.dsp:	unknown	2005-06-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Corrected quoting of string "pro-nt" VC++Files/sql/mysqld.dsp: Corrected quoting of string "pro-nt"
* \| \| \|	Merge jwinstead@production.mysql.com:my/mysql-5.0-11045	unknown	2005-07-06	2	-3/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-5.0-clean VC++Files/sql/mysqld.dsp: Auto merged sql/ha_federated.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_union.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged sql/item_strfunc.cc: SCCS merged