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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Updated various tests results which were missed during auto-merge	unknown	2003-09-01	6	-31/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with replication over SSL patch. mysql-test/r/rpl_error_ignored_table.result: New SSL related fields in SHOW SLAVE STATUS mysql-test/r/rpl_loaddata.result: New SSL related fields in SHOW SLAVE STATUS mysql-test/r/rpl_max_relay_size.result: New SSL related fields in SHOW SLAVE STATUS mysql-test/r/rpl_openssl.result: Post merge update of SHOW SLAVE STATUS result mysql-test/r/rpl_reset_slave.result: New SSL related fields in SHOW SLAVE STATUS mysql-test/r/rpl_rotate_logs.result: Fixed bad manual merge result
*	Manual merge fixes	unknown	2003-09-01	43	-61/+402
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sql/lex.h: Auto merged sql/mysqld.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/share/czech/errmsg.txt: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/dutch/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/german/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/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 sql/sql_lex.h: Auto merged sql/sql_repl.cc: Auto merged sql/sql_yacc.yy: Auto merged include/mysqld_error.h: Mabual merge mysql-test/r/rpl_flush_log_loop.result: Mabual merge mysql-test/r/rpl_log.result: Mabual merge mysql-test/r/rpl_log_pos.result: Mabual merge mysql-test/r/rpl_replicate_do.result: Mabual merge mysql-test/r/rpl_rotate_logs.result: Mabual merge sql/slave.cc: Mabual merge sql/slave.h: Mabual merge
\| *	Implemented replication over SSL	unknown	2003-09-01	43	-60/+398
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS, Honoring this parameters during connection to master. Introduced new format of master.info file include/mysqld_error.h: Added error code for "slave without SSL ignored SSL params warning" mysql-test/Makefile.am: Copy files required for rpl_openssl test during the make process mysql-test/r/rpl000015.result: Added fields to SHOW SLAVE STATUS for replication over SSL mysql-test/r/rpl_empty_master_crash.result: Added fields to SHOW SLAVE STATUS for replication over SSL mysql-test/r/rpl_flush_log_loop.result: Added fields to SHOW SLAVE STATUS for replication over SSL mysql-test/r/rpl_log.result: Added fields to SHOW SLAVE STATUS for replication over SSL mysql-test/r/rpl_log_pos.result: Added fields to SHOW SLAVE STATUS for replication over SSL mysql-test/r/rpl_redirect.result: Added fields to SHOW SLAVE STATUS for replication over SSL mysql-test/r/rpl_replicate_do.result: Added fields to SHOW SLAVE STATUS for replication over SSL mysql-test/r/rpl_rotate_logs.result: Added fields to SHOW SLAVE STATUS for replication over SSL sql/lex.h: Added MASTER_SSL lexems for CHANGE MASTER sql/mysqld.cc: Added --master-ssl-ca parameter. Fixed description of other master-ssl parameters sql/repl_failsafe.cc: Added SSL support to connect_to_master() sql/share/czech/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/danish/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/dutch/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/english/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/estonian/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/french/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/german/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/greek/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/hungarian/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/italian/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/japanese/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/korean/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/norwegian-ny/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/norwegian/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/polish/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/portuguese/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/romanian/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/russian/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/serbian/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/slovak/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/spanish/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/swedish/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/share/ukrainian/errmsg.txt: Added "slave without SSL ignored SSL params" warning sql/slave.cc: Introduced new format of master.info file Added support of SSL params in master.info and SHOW SLAVE STATUS Added support of SSL connections sql/slave.h: Added SSL parameters to MASTER_INFO sql/sql_lex.h: Added SSL parameters for CHANGE MASTER TO sql/sql_repl.cc: Added SSL parameters for CHANGE MASTER TO sql/sql_yacc.yy: Added SSL parameters for CHANGE MASTER TO
* \|	Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2003-09-01	1	-4/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.r18.ru:/usr/home/ram/work/4.1
\| * \|	Fix for the bug #1125 mysqldump -X creates invalid XML	unknown	2003-08-28	1	-4/+4
\| \| \|
* \| \|	Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2003-08-30	2	-10/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into sinisa.nasamreza.org:/mnt/work/mysql-4.1
\| * \| \|	Two small fixes	unknown	2003-08-30	2	-10/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/isam.result: Fixing results to match test changes sql/sql_union.cc: Better fix for VC++
* \| \| \|	Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2003-08-30	1	-3/+3
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into hegel.local:/home/miguel/bk/mysql-4.1
\| * \| \|	Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2003-08-30	1	-3/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into sinisa.nasamreza.org:/mnt/work/mysql-4.1
\| \| * \| \|	Fix for a compilation problem with VC++	unknown	2003-08-30	1	-3/+3
\| \| \| \| \|
* \| \| \| \|	Fix VC++ compiler error with redifinition return type	unknown	2003-08-29	1	-1/+1
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	include/thr_alarm.h: Fix VC++ compiler error with redefinition return type
* \| \| \|	Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1	unknown	2003-08-29	4	-24/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into sanja.is.com.ua:/home/bell/mysql/bk/work-tmp_field-4.1
\| * \| \| \|	tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of ↵	unknown	2003-08-29	4	-24/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tmp_table_field(TABLE *t_arg) sql/item_timefunc.h: no need redefine tmp_table_field(), it will be inherited
* \| \| \| \|	comment left after merge was moved to correct	unknown	2003-08-29	1	-1/+1
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	place sql/sql_class.h: comment moved to correct place
* \| \| \|	Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2003-08-29	6	-4/+57
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.fix
\| * \| \| \|	Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE	unknown	2003-08-28	6	-23/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit is related to my previos one(ChangeSet 1.1583 03/08/27 18:03:39). Note about COMMIT&ROLLBACK: Only 'COMMIT' statement updates the binary log. 'ROLLBACK' statement doesn't update the binlog. mysql-test/r/drop.result: Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE mysql-test/r/innodb.result: Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE mysql-test/t/drop.test: Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE mysql-test/t/innodb.test: Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE sql/handler.cc: Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE sql/sql_table.cc: Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
\| * \| \| \|	Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE	unknown	2003-08-27	3	-0/+37
\| \| \| \| \|
* \| \| \| \|	Fixed problem with absence of gmtime_r under Windows.	unknown	2003-08-29	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	include/my_pthread.h: HAVE_GMTIME_R should not be defined under Windows (it is ok for HAVE_LOCALTIME_R since there additional implementation in my_windcond.c.
* \| \| \| \|	Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1	unknown	2003-08-28	3	-20/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into sanja.is.com.ua:/home/bell/mysql/bk/work-enum-4.1 sql/sql_select.cc: Auto merged
\| * \| \| \| \|	enum renamed (asked for compilation under windows)	unknown	2003-08-28	3	-20/+20
\| \| \| \| \| \|
* \| \| \| \| \|	fixed typo	unknown	2003-08-28	1	-1/+1
\| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2003-08-28	4	-10/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
\| * \ \ \ \	Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2003-08-28	7	-1/+203
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into deer.(none):/home/hf/work/mysql-4.1.clean
\| * \| \| \| \|	SCRUM:	unknown	2003-08-28	4	-10/+10
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed some mess with STDCALL in function's declarations include/mysql.h: That definitions are more correct libmysqld/lib_sql.cc: should be declared as STDCALL libmysqld/libmysqld.c: should be declared as STDCALL sql-common/client.c: should be declared as STDCALL
* \| \| \| \|	Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1	unknown	2003-08-28	7	-1/+203
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-aggregate-4.1
\| * \| \| \|	Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2003-08-28	7	-1/+203
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1
\| \| * \| \|	fixed merge mistake	unknown	2003-08-28	2	-3/+0
\| \| \| \| \|
\| \| * \| \|	Merge	unknown	2003-08-27	7	-1/+206
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sql/field.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged mysql-test/r/create.result: merge mysql-test/t/create.test: merge sql/item_cmpfunc.h: SCCS merged
\| \| \| * \ \	Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1	unknown	2003-08-27	7	-0/+202
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1 sql/field.h: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged
\| \| \| \| * \| \|	fixed bug #910 (right type of ifnull function)	unknown	2003-08-27	7	-0/+202
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/create.result: added test for bug #910 (right type of ifnull function) mysql-test/t/create.test: added test for bug #910 (right type of ifnull function) sql/field.h: added new constructors of Field_decimal, Field_tiny, Field_short, Field_float, Field_null, Field_year for using in Item::tmp_table_field_from_field_type sql/item.cc: added Item::tmp_table_field_from_field_type sql/item.h: added Item::tmp_table_field_from_field_type
* \| \| \| \| \| \|	reset() split in 2 function clear() & add()	unknown	2003-08-28	7	-45/+69
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	aggregate function reinitialization (if no rows was found) made with help of clear() (fixed BUG#860) mysql-test/r/subselect.result: test for BUG#860 mysql-test/t/subselect.test: test for BUG#860 sql/item_sum.cc: reset() replaced with clear() sql/item_sum.h: reset() replaced with clear() (reset now is just composition of clear() and add()) sql/item_uniq.h: reset() replaced with clear() sql/sql_select.cc: removed NULL value assigment, now it will be done by clear() call function for clearing if there was not found any row in group sql/sql_select.h: function for clearing if there was not found any row in group
* \| \| \| \| \|	Merge bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2003-08-27	10	-36/+67
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into narttu.mysql.fi:/my/mysql-4.1
\| * \| \| \| \|	hanged UDF interface to use clear() instead of reset()	unknown	2003-08-27	10	-36/+67
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BUILD/FINISH.sh: Add just_clean option (for cleanup script) scripts/mysql_fix_privilege_tables.sql: Added 'USE mysql' for easer use on windows sql/item_sum.cc: Changed UDF interface to use clear() instead of reset() sql/item_sum.h: Changed UDF interface to use clear() instead of reset() sql/slave.cc: Fixed checking of eof for slave/master protocol. (Bug #887) sql/sql_udf.cc: Changed UDF interface to use clear() instead of reset() sql/sql_udf.h: Changed UDF interface to use clear() instead of reset() sql/sql_yacc.yy: ERRORS and WARNINGS should not be reserved words sql/udf_example.cc: Changed UDF interface to use clear() instead of reset()
* \| \| \| \|	Merge fixes	unknown	2003-08-27	1	-28/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sql/sql_union.cc: Some further merge fixes
* \| \| \| \|	sql_union.cc:	unknown	2003-08-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Post merge fixes sql/sql_union.cc: Post merge fixes
* \| \| \| \|	merge fixes	unknown	2003-08-27	5	-46/+55
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sql/sql_lex.h: Auto merged sql/sql_select.cc: Auto merged
\| * \| \| \| \|	symlink.result:	unknown	2003-08-25	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for a small error in the merge from 4.0 mysql-test/r/symlink.result: Fix for a small error in the merge from 4.0
\| * \| \| \| \|	union.result:	unknown	2003-08-23	4	-20/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	same as above sql_lex.h: same as above sql_union.cc: same as aobve sql_select.cc: Fixing that SQL_CALC_FOUND_ROWS work properly in UNION's in 4.1 Plus updating some fields in THD in the proper places plus fixing a wrong result sql/sql_select.cc: Fixing that SQL_CALC_FOUND_ROWS work properly in UNION's in 4.1 Plus updating some fields in THD in the proper places plus fixing a wrong result sql/sql_union.cc: same as aobve sql/sql_lex.h: same as above mysql-test/r/union.result: same as above
* \| \| \| \| \|	Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1	unknown	2003-08-26	9	-53/+81
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1
\| * \| \| \| \|	Fix for bug in ROLLUP when all tables where 'const' tables (Bug #714)	unknown	2003-08-26	4	-11/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/olap.result: new test case for bug mysql-test/t/olap.test: new test case for bug sql-common/client.c: Safety fix
\| * \| \| \| \|	Merge bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2003-08-26	5	-42/+39
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into narttu.mysql.fi:/my/mysql-4.1 sql/sql_yacc.yy: Auto merged
\| \| * \| \| \| \|	Cleanups	unknown	2003-08-26	5	-42/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BTREE, HASH and RTREE are not reserved symbols anymore mysql-test/t/loaddata.test: Removed empty lines mysys/my_malloc.c: Fixed old style variable name mysys/my_realloc.c: Fixed old style variable name sql/sql_yacc.yy: BTREE, HASH and RTREE are not reserved symbols anymore sql/table.cc: Simple optimization
* \| \| \| \| \| \|	Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1	unknown	2003-08-26	8	-40/+196
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1
\| * \| \| \| \| \|	removed --rpl option of ./mysql-test-run	unknown	2003-08-25	1	-15/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(./mysql-test-run t/rpl*.test do same work)
\| * \| \| \| \| \|	CAST(expr AS CHAR(10)) is now working	unknown	2003-08-21	7	-25/+192
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	merge	unknown	2003-08-21	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/subselect.result: correct result after merging with fixed Item_in_optimiser::fix_left() mysql-test/t/subselect.test: error code changed
* \| \| \| \| \| \|	merge	unknown	2003-08-20	3	-0/+20
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sql/item.cc: Auto merged sql/item.h: Auto merged
\| * \| \| \| \| \|	Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1	unknown	2003-08-12	22	-74/+376
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1
\| * \| \| \| \| \| \|	fixed collation of Item_cache family (BUG#951)	unknown	2003-08-11	4	-1/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/subselect.result: test of collation mysql-test/t/subselect.test: test of collation sql/item.cc: coping collation in the cache sql/item.h: coping collation in the cache
* \| \| \| \| \| \| \|	Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1	unknown	2003-08-20	2	-16/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1