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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Default table character set has been added:	unknown	2002-06-19	7	-14/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CREATE TABLE a (field,...) TYPE=type CHARSET=cset; sql/handler.h: New flag to remember whether new table default charset has been passed in ALTER TABLE sql/lex.h: New language symbol sql/sql_show.cc: Display default table charset if exists sql/sql_table.cc: Check table charset before default server charset sql/sql_yacc.yy: New create table option: default table character set sql/table.cc: Table charset sql/unireg.cc: field->charset must be initialized before. So assumes it is not NULL
*	UCS2 charset has been added	unknown	2002-06-17	6	-2/+384
\|
*	All instances of "ulong" were replaced with "unsigned long" for portability ↵	unknown	2002-06-17	1	-13/+14
\| \| \| \| \| \| \| \| \|	reasons. Failed to compile at least on freebsd.
*	sql_prepare.cc:	unknown	2002-06-14	0	-0/+0
\| \| \| \| \| \| \| \|	corrected the symlink libmysqld/sql_prepare.cc: corrected the symlink
*	Makefile.am:	unknown	2002-06-14	1	-3/+4
\| \| \| \| \| \| \| \| \| \|	Added missing sql_prepare.cc & sql_error.cc to libmysqld sql_error.cc, sql_prepare.cc: new file libmysqld/Makefile.am: Added missing sql_prepare.cc & sql_error.cc to libmysqld
*	client_test.c:	unknown	2002-06-13	1	-158/+119
\| \| \| \| \| \| \| \|	Forgot to include the portable changes from previous commit tests/client_test.c: Forgot to include the portable changes from previous commit
*	client_test.c:	unknown	2002-06-13	2	-1/+2553
\| \| \| \| \| \| \| \| \|	new file 'C' Test case for all prototype changes - Assert based which covers all most all scenarios
*	sql_list.h:	unknown	2002-06-12	1	-1/+3
\| \| \| \| \| \| \| \|	One more missed fix from Windows sql/sql_list.h: One more missed fix from Windows
*	mysql_priv.h:	unknown	2002-06-12	1	-1/+2
\| \| \| \| \| \| \| \|	Missed change from previous resolve sql/mysql_priv.h: Missed change from previous resolve
*	sql_error.cc, sql_prepare.cc:	unknown	2002-06-12	22	-58/+1794
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	new file Client-server protocol 4.1 changes - Server side: * Enhanced metadata information: - SHOW [COUNT()] ERRORS [LIMIT [offset,] rows] - SHOW [COUNT()] WARNING [LIMIT [offset,] rows] - SHOW TABLE TYPES - SHOW PRIVILEGES - SHOW COLUMN TYPES (Not fully implemented) * Prepared execution * Long data handling in pieces * And other misc changes
*	Client-Server Protocol 4.1 changes - Client side:	unknown	2002-06-12	6	-64/+1464
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Support of prepared execution - Support of Original Table and Column names - Support of direct transactional API - And lot of misc handling (Note that, the pull will not work, unless you have the Server side changes also which will be followed by this commit) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
*	test_charset.c:	unknown	2002-06-11	1	-2/+2
\| \| \| \| \| \| \| \|	fix: use my_free() instead of free() mysys/test_charset.c: fix: use my_free() instead of free()
*	New command: SHOW CHARACTER SET [LIKE 'wild']	unknown	2002-06-11	5	-1/+45
\|
*	Merge abelkin@work.mysql.com:/home/bk/mysql-4.1	unknown	2002-06-10	1	-1576/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
\| *	deleted accidentally pushed file	unknown	2002-06-10	1	-1576/+0
\| \| \| \| \| \| \| \| \| \|	BitKeeper/deleted/.del-sql_select.cc.rej~b567fd439ef37cc8: Delete: sql/sql_select.cc.rej
* \|	Fixed that charset was not properly strored in index segment on myisam table	unknown	2002-06-10	1	-1/+2
\| \|
* \|	strto.c:	unknown	2002-06-10	1	-2/+2
\|/ \| \| \| \| \| \| \|	Fix for typos in system_charset_info strings/strto.c: Fix for typos in system_charset_info
*	.del-makefile2.w32:	unknown	2002-06-07	0	-0/+0
\| \| \| \| \| \| \| \|	Rename: BitKeeper/deleted/.del-makefile.w32 -> BitKeeper/deleted/.del-makefile2.w32 BitKeeper/deleted/.del-makefile2.w32: Rename: BitKeeper/deleted/.del-makefile.w32 -> BitKeeper/deleted/.del-makefile2.w32
*	temporary preventing subselect in HAVING clause	unknown	2002-06-07	4	-3/+16
\|
*	Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1	unknown	2002-06-07	16	-52/+115
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into sanja.is.com.ua:/home/bell/mysql/work-select_lex-4.1 sql/mysql_priv.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged
\| *	Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1	unknown	2002-06-07	1	-4/+51
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into gw.udmsearch.izhnet.ru:/usr/home/ram/mysql-4.1
\| \| *	check_one_rb_key() func	unknown	2002-06-07	1	-4/+51
\| \| \|
\| * \|	Charset of any string field now can be specified during CREATE TABLE	unknown	2002-06-07	14	-47/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/alter_table.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/create.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/fulltext.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/innodb.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/merge.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/select.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/show_check.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/symlink.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/type_blob.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/type_ranges.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS sql/field.cc: New format for string fields in SHOW CREATE TABLE and SHOW FIELDS sql/mysql_priv.h: pass charset sql/sql_parse.cc: QQ is now fixed :) sql/sql_yacc.yy: New format for string fields in SHOW CREATE TABLE and SHOW FIELDS
\| * \|	configure.in:	unknown	2002-06-05	1	-1/+1
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	changed version number
* \|	Prevent needless rexecuting empty subselects	unknown	2002-06-06	3	-4/+7
\| \|
* \|	post-merged fixing	unknown	2002-06-05	2	-4/+4
\| \|
* \|	fixing after mergin	unknown	2002-06-05	1	-1/+1
\| \|
* \|	merged	unknown	2002-06-05	1077	-98980/+13517
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sql/item.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_update.cc: Auto merged
\| *	Merge work:/my/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1	unknown	2002-06-04	1054	-98971/+12979
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	heap/hp_write.c: Auto merged include/my_tree.h: Auto merged mysys/charset.c: Auto merged sql/item_strfunc.cc: Auto merged sql/sql_yacc.yy: Auto merged
\| \| *	Update results for new SHOW FULL COLUMNS	unknown	2002-06-04	6	-129/+131
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Portability fixes include/my_tree.h: Add missing include file. mysql-test/r/select.result: Update results for new SHOW FULL COLUMNS mysql-test/r/type_blob.result: Update results for new SHOW FULL COLUMNS mysql-test/r/type_float.result: Update results for new SHOW FULL COLUMNS mysql-test/r/type_ranges.result: Update results for new SHOW FULL COLUMNS mysql-test/t/heap_btree.test: Update results for new SHOW FULL COLUMNS
\| \| *	merge with 4.0 to get last fixes to last merge	unknown	2002-06-04	18	-70/+110
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BitKeeper/etc/logging_ok: auto-union Docs/manual.texi: Auto merged client/mysqltest.c: Auto merged mysql-test/r/alter_table.result: Auto merged mysql-test/r/func_math.result: Auto merged sql/hostname.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: merge with 4.0
\| \| \| *	Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0	unknown	2002-06-04	15	-55/+83
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs/manual.texi: Auto merged sql/sql_parse.cc: Auto merged
\| \| \| \| *	Enable LOAD DATA LOCAL INFILE in mysql_test	unknown	2002-06-04	15	-55/+83
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added syntax for column comments (for compability with 4.1) Fix of ALTER TABLE RENAME Docs/manual.texi: Changelog client/mysqltest.c: Enable LOAD DATA LOCAL INFILE mysql-test/r/alter_table.result: Test of syntax for column comments mysql-test/r/func_math.result: Fixed test of new truncate mysql-test/t/alter_table.test: Test of syntax for column comments mysys/my_gethostbyname.c: Portability fix sql/hostname.cc: Fixed pointer bug sql/item_cmpfunc.cc: Optimizing LIKE code sql/item_cmpfunc.h: Cleanup sql/mysqld.cc: Avoid warning of duplicate calls to mysql_thread_init() sql/sql_analyse.cc: Removed warning from DBUG sql/sql_parse.cc: Avoid warning of duplicate calls to mysql_thread_init() sql/sql_table.cc: Fix of ALTER TABLE RENAME sql/sql_yacc.yy: Added syntax for field comments vio/test-sslserver.c: Cleanup
\| \| \| * \|	Merge sinisa@work.mysql.com:/home/bk/mysql-4.0	unknown	2002-06-03	1	-1/+10
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
\| \| \| \| * \|	A bug fix when for SELECT ... INTO OUTFILE ....	unknown	2002-06-03	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	user has table privilege and global FILE privilege
\| \| \| * \| \|	mirrors.texi:	unknown	2002-06-03	2	-9/+1
\| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update mirror list Docs/mirrors.texi: Update mirror list BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
\| \| \| * \|	Merge sinisa@work.mysql.com:/home/bk/mysql-4.0	unknown	2002-06-03	1	-0/+1
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
\| \| \| \| * \|	fix for a multi-table delete bug when optimiser used only indices	unknown	2002-06-01	1	-0/+1
\| \| \| \| \| \|
\| \| \| * \| \|	Clarified mysqldump -T option (noted by James Green).	unknown	2002-06-03	1	-3/+6
\| \| \| \| \| \|
\| \| \| * \| \|	Added proper spelling of 'deprecated' to writing guidelines document.	unknown	2002-06-03	1	-2/+5
\| \| \| \| \| \|
\| \| \| * \| \|	Typo fixup.	unknown	2002-06-03	1	-1/+1
\| \| \| \| \| \|
\| \| \| * \| \|	Fixed two bugs in my_getopt.	unknown	2002-06-03	1	-2/+8
\| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysys/my_getopt.c: Fixed two bugs in my_getopt: - argc was decremented twice when type was GET_BOOL and short option was used. This caused all GET_BOOL -type short-options to malfunction. - Fixed a bug in argv handling. Any program that used argv directly without checking argc first, tried to use (already handled) options as non-option arguments, after all true non-option arguments were handled. At least mysqldump was affected by this bug.
\| \| * \| \|	Changes for new binary .frm format	unknown	2002-06-04	24	-79/+168
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes after last merge from 4.0. (Code not yet complete, need anoter merge from 4.0) heap/hp_write.c: cleanup myisam/ft_boolean_search.c: Fixed tree handling to new format mysql-test/r/alter_table.result: SHOW FULL COLUMN FROM TABLE now returns comment mysql-test/r/func_math.result: Updated results mysql-test/r/heap_btree.result: Portability fix mysql-test/r/isam.result: SHOW FULL COLUMN FROM TABLE now returns comment mysql-test/r/show_check.result: SHOW FULL COLUMN FROM TABLE now returns comment mysql-test/t/heap_btree.test: Portability fix mysql-test/t/show_check.test: SHOW FULL COLUMN FROM TABLE now returns comment sql/field.cc: Fix for comment handling sql/field.h: Added CHARSET_INFO to field structure sql/item_cmpfunc.cc: Fixed like to use system charset (need to be updated) sql/item_func.cc: Update to new charset handling sql/mysql_priv.h: cleanup sql/sql_base.cc: Added charset to HA_CREATE_INFO sql/sql_delete.cc: Added charset to HA_CREATE_INFO sql/sql_parse.cc: Added charset to HA_CREATE_INFO sql/sql_select.cc: cleanup sql/sql_show.cc: charset change sql/sql_string.h: cleanup sql/sql_table.cc: cleanup sql/sql_yacc.yy: Go back to old code for ALTER table ... MODIFY sql/table.cc: fixed comment handling sql/unireg.cc: new field format
\| \| * \| \|	merge with 4.0	unknown	2002-06-03	1035	-98403/+12102
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged BUILD/compile-pentium-debug: Auto merged BitKeeper/triggers/post-commit: Auto merged configure.in: Auto merged Docs/manual.texi: Auto merged client/mysql.cc: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged extra/mysql_install.c: Auto merged extra/resolve_stack_dump.c: Auto merged extra/resolveip.c: Auto merged include/my_sys.h: Auto merged include/mysqld_error.h: Auto merged isam/pack_isam.c: Auto merged libmysql/Makefile.shared: Auto merged libmysql/libmysql.c: Auto merged myisam/ft_dump.c: Auto merged myisam/ft_test1.c: Auto merged myisam/ftdefs.h: Auto merged myisam/mi_check.c: Auto merged myisam/mi_test1.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/select_found.result: Auto merged mysql-test/t/select_found.test: Auto merged mysys/charset.c: Auto merged mysys/default.c: Auto merged mysys/hash.c: Auto merged sql/field.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/hostname.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/lex.h: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_union.cc: Auto merged sql/share/czech/errmsg.txt: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/dutch/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/share/german/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/sql_update.cc: Auto merged sql/structs.h: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged strings/Makefile.am: Auto merged strings/ctype-ujis.c: Auto merged tools/mysqlmanager.c: Auto merged
\| \| \| * \|	merge with 3.23	unknown	2002-06-02	13	-16/+43
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BitKeeper/deleted/.del-rpl_empty_master_crash.result: Delete: mysql-test/r/rpl_empty_master_crash.result BitKeeper/deleted/.del-rpl_empty_master_crash.test: Delete: mysql-test/t/rpl_empty_master_crash.test configure.in: Auto merged include/my_net.h: Auto merged include/my_pthread.h: Auto merged libmysql/libmysql.c: Auto merged mysql-test/t/func_math.test: Auto merged mysys/my_gethostbyname.c: Auto merged sql/ha_innodb.cc: Auto merged sql/item_func.cc: Auto merged
\| \| \| \| * \	Merge nleippe@work.mysql.com:/home/bk/mysql	unknown	2002-05-31	3	-0/+16
\| \| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into nick.leippe.com:/home/nick/mysql/mysql
\| \| \| \| \| * \|	fixed 'load table from master' hang when host is empty	unknown	2002-05-31	3	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added respective test case sql/slave.cc: fixed load table from master hang when host is empty
\| \| \| \| * \| \|	Portability fixes for SCO and HPUX	unknown	2002-05-31	10	-12/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change TRUNCATE(number) to truncate towards zero for negative numbers Fix NULL handling for DESCRIBE table_name Docs/manual.texi: Update of TRUNCATE() information configure.in: Fix for HPUX extra/resolveip.c: Fix for SCO include/my_net.h: Fix for HPUX libmysql/libmysql.c: Removed warning on HPUX 10.20 mysql-test/r/func_math.result: Test of new TRUNCATE handling mysql-test/t/func_math.test: Test of new TRUNCATE handling mysys/my_gethostbyname.c: Portability fix sql/item_func.cc: Change TRUNCATE(number) to truncate towards zero for negative numbers sql/sql_show.cc: Fix NULL handling for DESCRIBE table_name
\| \| \| \| * \| \|	Fixed a problem with --skip-networking.	unknown	2002-05-31	1	-1/+1
\| \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fix should be merged into 4.0 and 4.1
\| \| \| \| * \|	A small fix for HP-UX when used --with-debug	unknown	2002-05-30	1	-1/+1
\| \| \| \| \| \|