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

	Commit message (Collapse)	Author	Age	Files	Lines
*	merge	unknown	2005-03-29	5	-20/+176
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysys/charset-def.c: Auto merged BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e: Auto merged sql/mysqld.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-utf8.c: Auto merged mysql-test/r/type_blob.result: after merge fix
\| *	ctype-utf8.c, ctype-sjis.c:	unknown	2005-03-29	2	-13/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Safer and mode readable way. strings/ctype-sjis.c: Safer and mode readable way. strings/ctype-utf8.c: Safer and mode readable way.
\| *	ctype-big5.c:	unknown	2005-03-29	1	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More readable and safer way. strings/ctype-big5.c: More readable and safer way.
\| *	Better error message.	unknown	2005-03-29	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bugs#9057: Incorrect errormsg for too-large char field in table definition
\| *	Remove redundant my_security_attr_free() from	unknown	2005-03-29	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	handle_connections_shared_memory (double free spotted by Monty). sql/mysqld.cc: Remove excessive my_security_attr_free()
\| *	Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-03-29	2	-0/+172
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/usr/home/bar/mysql-4.1
\| \| *	Adding Cybozu's patch.	unknown	2005-03-29	2	-0/+172
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Not active by default. One need to pass -DHAVE_CYBOZU_COLLATION to activate it. mysys/charset-def.c: Adding Cybozu's patch. Not active by default. strings/ctype-utf8.c: Adding Cybozu's patch. Not active by default.
* \| \|	Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2005-03-29	1	-13/+117
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/cps/mysql/trees/mysql-5.0
\| * \| \|	more merge fixes	unknown	2005-03-29	1	-8/+4
\| \| \| \|
\| * \| \|	manual merge	unknown	2005-03-29	1	-11/+119
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-03-29	1	-14/+121
\| \| \|\ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/cps/mysql/trees/mysql-4.1
\| \| \| *	Post-review fixes for "!include" patch originating from Yahoo! (the whole ↵	unknown	2005-03-25	1	-14/+121
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	patch is recommitted) mysys/default.c: Post-review fixes for "!include" patch originating from Yahoo!
* \| \| \|	Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl	unknown	2005-03-29	2	-2/+286
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile mysql-test/mysql-test-run.pl: Auto merged
\| * \| \|	mysql-test-run.pl:	unknown	2005-03-29	2	-2/+286
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Corrected typo mtr_diff.pl: A simplified unified diff in Perl new file mysql-test/lib/mtr_diff.pl: A simplified unified diff in Perl mysql-test/mysql-test-run.pl: Corrected typo
* \| \|	Merge	unknown	2005-03-28	31	-218/+382
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	client/mysqltest.c: Auto merged BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003: Auto merged myisam/mi_create.c: Auto merged mysql-test/r/grant2.result: Auto merged mysql-test/r/metadata.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/type_enum.result: Auto merged mysql-test/t/grant2.test: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged ndb/src/kernel/blocks/dbacc/Dbacc.hpp: SCCS merged ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: SCCS merged sql/sql_union.cc: DBUG_ASSERT(TRUE) is useless so assume opposite
\| * \|	Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-03-28	2	-16/+28
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/space/pekka/ndb/version/my41
\| \| * \|	ndb - set up long key page vars in ACC_LOCKREQ (bug#????)	unknown	2005-03-28	2	-16/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ndb/src/kernel/blocks/dbacc/Dbacc.hpp: set up long key page vars in ACC_LOCKREQ ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: set up long key page vars in ACC_LOCKREQ
\| * \| \|	Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/	unknown	2005-03-28	7	-15/+46
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into serg.mylan:/usr/home/serg/Abk/mysql-4.1
\| * \ \ \	Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/	unknown	2005-03-28	4	-0/+31
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into serg.mylan:/usr/home/serg/Abk/mysql-4.1
\| * \| \| \| \|	more wild_compare tests	unknown	2005-03-27	2	-4/+39
\| \| \| \| \| \|
\| * \| \| \| \|	merged	unknown	2005-03-26	1	-2/+6
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	myisam/mi_create.c: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: merged with ul
\| \| * \ \ \ \	Merge bk-internal:/home/bk/mysql-4.0/	unknown	2005-03-26	35	-57/+177
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into serg.mylan:/usr/home/serg/Abk/mysql-4.0
\| \| * \| \| \| \| \|	fixes for "backport wild_compare fix from 4.1 - bug#3924"	unknown	2005-03-26	2	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sql/sql_acl.cc: don't use acl_cache for GRANT sql/sql_parse.cc: fixed backporting error in "backport wild_compare fix from 4.1 - bug#3924"
\| \| * \| \| \| \| \|	Merge bk-internal:/home/bk/mysql-4.0/	unknown	2005-03-04	0	-0/+0
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into serg.mylan:/usr/home/serg/Abk/mysql-4.0 myisam/mi_create.c: Auto merged
\| * \| \ \ \ \ \ \	Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/	unknown	2005-03-26	29	-214/+340
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into serg.mylan:/usr/home/serg/Abk/mysql-4.1 acinclude.m4: Auto merged mysql-test/r/ps_1general.result: Auto merged
\| \| * \| \| \| \| \| \|	mysql-test/r/ps_6bdb.result	unknown	2005-03-24	1	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	followup - results fixed mysql-test/r/ps_6bdb.result: followup - results fixed
\| \| * \| \| \| \| \| \|	Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/	unknown	2005-03-23	28	-203/+329
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into serg.mylan:/usr/home/serg/Abk/mysql-4.1
\| \| \| * \| \| \| \| \| \|	upgrade zlib to 1.2.2	unknown	2005-03-23	18	-137/+252
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	acinclude.m4: clarify help text
\| \| \| * \| \| \| \| \| \|	client/mysqltest.c	unknown	2005-03-23	9	-66/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	corrected number of fields for --enable_metadata sql/sql_union.cc fixed a apparent typo in assert client/mysqltest.c: corrected number of fields for --enable_metadata mysql-test/r/metadata.result: corrected number of fields for --enable_metadata mysql-test/r/ps_1general.result: corrected number of fields for --enable_metadata mysql-test/r/ps_2myisam.result: corrected number of fields for --enable_metadata mysql-test/r/ps_3innodb.result: corrected number of fields for --enable_metadata mysql-test/r/ps_4heap.result: corrected number of fields for --enable_metadata mysql-test/r/ps_5merge.result: corrected number of fields for --enable_metadata mysql-test/r/type_enum.result: corrected number of fields for --enable_metadata sql/sql_union.cc: fixed a apparent typo in assert
\| \| \| * \| \| \| \| \| \|	don't allow to commit as mysqldev	unknown	2005-03-18	1	-0/+11
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge mysql.com:/export/space/pekka/ndb/version/my41	unknown	2005-03-28	2	-12/+15
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/export/space/pekka/ndb/version/my50
\| * \| \| \| \| \| \| \| \|	ndb - make printSchemaFile available (compile manually)	unknown	2005-03-28	2	-12/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BitKeeper/deleted/.del-Makefile~b03e75f2bff8d72: Delete: ndb/src/kernel/blocks/dbdict/printSchemafile/Makefile ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp: compile manually
* \| \| \| \| \| \| \| \| \|	Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1	unknown	2005-03-28	2	-0/+11
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0 mysql-test/r/union.result: Auto merged mysql-test/t/union.test: Auto merged
\| * \| \| \| \| \| \| \| \|	union.test:	unknown	2005-03-28	2	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug #6519 UNION with collation binary and latin1_swedish_ci fails now Prove that this problem was fixed with bug9425 fix too. mysql-test/t/union.test: Bug #6519 UNION with collation binary and latin1_swedish_ci fails now Prove that this problem was fixed with bug9425 fix too.
* \| \| \| \| \| \| \| \| \|	item_func.cc:	unknown	2005-03-28	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Post merge additional fix for DECIMAL type: Bugs: #9425: A user variable doesn't always have implicit coercibility sql/item_func.cc: Post merge additional fix for DECIMAL type: Bugs: #9425: A user variable doesn't always have implicit coercibility
* \| \| \| \| \| \| \| \| \|	Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1	unknown	2005-03-28	3	-3/+20
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0 mysql-test/r/user_var.result: Auto merged mysql-test/t/user_var.test: Auto merged sql/item_func.cc: Auto merged
\| * \| \| \| \| \| \| \| \|	Bug#9425 A user variable doesn't always have implicit coercibility	unknown	2005-03-28	3	-3/+20
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Coercibility fixes for numeric types and not defined values were done.
* \| \| \| \| \| \| \| \|	Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1	unknown	2005-03-28	4	-0/+31
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0 mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/func_system.result: Auto merged
\| * \| \| \| \| \| \| \|	func_system.test, ctype_utf8.test, func_system.result, ctype_utf8.result:	unknown	2005-03-28	4	-0/+31
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prove that the queries mentioned in Bugs#5980: NULL requires a characterset in a union works fine after recent changes related to itroducing more coercibility level: IRNORABLE and SYSCONST. mysql-test/r/ctype_utf8.result: Prove that the queries mentioned in Bugs#5980: NULL requires a characterset in a union works fine after recent changes related to itroducing more coercibility level: IRNORABLE and SYSCONST. mysql-test/r/func_system.result: Prove that the queries mentioned in Bugs#5980: NULL requires a characterset in a union works fine after recent changes related to itroducing more coercibility level: IRNORABLE and SYSCONST. mysql-test/t/ctype_utf8.test: Prove that the queries mentioned in Bugs#5980: NULL requires a characterset in a union works fine after recent changes related to itroducing more coercibility level: IRNORABLE and SYSCONST. mysql-test/t/func_system.test: Prove that the queries mentioned in Bugs#5980: NULL requires a characterset in a union works fine after recent changes related to itroducing more coercibility level: IRNORABLE and SYSCONST.
* \| \| \| \| \| \| \|	Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2005-03-26	20	-185/+271
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
\| * \ \ \ \ \ \ \	Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2005-03-25	20	-185/+271
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
\| \| * \| \| \| \| \| \| \|	WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero.	unknown	2005-03-25	20	-185/+271
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This saves one byte per Query_log_event on disk compared to 5.0.[0..3]. Compatibility problems with 5.0.x where x<4 are explained in the comments in log_event.cc. Putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE. If slave fails in Execute_load_query_log_event::exec_event(), don't delete the file (so that it's re-usable at next START SLAVE). And (youpi!) fix for BUG#3247 "a partially completed LOAD DATA INFILE is not executed at all on the slave" (storing an Execute_load_query_log_event to binlog, with its error code, instead of Delete_file_log_event). mysql-test/r/mix_innodb_myisam_binlog.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_change_master.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_deadlock.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_error_ignored_table.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_flush_log_loop.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_loaddata.result: we now use one less byte when storing the catalog in binlog so positions change. Plus testing replication of LOAD DATA INFILE if duplicate key and non-transactional table. mysql-test/r/rpl_log.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_max_relay_size.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_relayrotate.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_replicate_do.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_rotate_logs.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_until.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/t/mysqlbinlog.test: we now use one less byte when storing the catalog in binlog so positions change mysql-test/t/mysqlbinlog2.test: we now use one less byte when storing the catalog in binlog so positions change mysql-test/t/rpl_deadlock.test: we now use one less byte when storing the catalog in binlog so positions change mysql-test/t/rpl_loaddata.test: we now use one less byte when storing the catalog in binlog so positions change. Plus testing replication of LOAD DATA INFILE if duplicate key and non-transactional table. mysql-test/t/rpl_until.test: we now use one less byte when storing the catalog in binlog so positions change sql/log_event.cc: a) We now store the catalog in Query_log_event in binlog WITHOUT its end zero. This saves one byte per Query_log_event on disk. Compatibility problems with 5.0.x where x<4 are explained in the comments in this file. b) putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE. c) if slave fails in Execute_load_query_log_event::exec_event(), don't delete the file (so that it's re-usable at next START SLAVE). sql/log_event.h: We now store the catalog in Query_log_event in binlog WITHOUT its end zero. This saves one byte per Query_log_event on disk. This new storage for the catalog is denoted by Q_CATALOG_NZ_CODE (couldn't re-use Q_CATALOG_CODE as 5.0.3 slaves of this 5.0.4 master would segfault because it would expect a 0 when there is none. Renaming get_open_mode() to get_create_or_append() (see log_event.cc) sql/sql_load.cc: Fix for BUG#3247: if LOAD DATA INFILE fails but has permanently updated a table (i.e. has deleted/added/modified some rows in a non-transactional table), we must write an Execute_load_query_log_event to binlog (with the error code, as this class beautifully inherits from Query_log_event, it can store the error code - thanks Dmitri) and not a Delete_file_log_event (we use to write a Delete_file_log_event: no update happened on slave, bug).
* \| \| \| \| \| \| \| \| \|	Manual merge	unknown	2005-03-26	6	-23/+275
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	A fix for Bug#8226 "Cannot connect via shared memory":	unknown	2005-03-26	6	-23/+275
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	provide created shared memory objects with proper access rights to make them usable when client and server are running under different accounts. Post review fixes. VC++Files/mysys/mysys.dsp: Add my_windac.c to mysys.lib include/my_sys.h: Declarations for SECURITY_ATTRIBUTES create/destroy functions. mysys/Makefile.am: Add my_windac.c to the list of compiled files. sql-common/client.c: Lower requested access rights for events as the server won't provide clients with ALL access in order to prevent denial of service attack. sql/mysqld.cc: Set proper security attributes for the kernel objects to make them usable when mysqld is running as a Windows service.
* \| \| \| \| \| \| \| \| \|	fixed conflict making embedded server with libmysqld	unknown	2005-03-25	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	libmysqld/Makefile.am: Fixed conflict
\| * \| \| \| \| \| \| \| \|	Fixing blackhole support in libmysqld	unknown	2005-03-25	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	libmysqld/Makefile.am: Adding ha_blackhole.cc
* \| \| \| \| \| \| \| \| \|	Adding rules for building blackhole, also updating test case.	unknown	2005-03-25	3	-1/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	configure.in: Adding logic to run blackhole configure option. mysql-test/r/blackhole.result: Correction this, but I think I need to see why the warning is being generated in the first place.
* \| \| \| \| \| \| \| \| \|	Resolving merge.	unknown	2005-03-25	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sql/handler.h: Auto merged mysql-test/r/ps_1general.result: Resolving conflict in layout.
\| * \| \| \| \| \| \| \| \|	Fix upgrade/downgrade issue.	unknown	2005-03-25	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/ps_1general.result: Fix test case. sql/handler.h: Added federated to the list so that any beta users won't end up with a mismatch for table enum
\| * \| \| \| \| \| \| \| \|	Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-03-25	8	-6/+66
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into zim.(none):/home/brian/mysql/mysql-4.1