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

	Commit message (Collapse)	Author	Age	Files	Lines
*	mysql_com.h:	unknown	2004-08-19	2	-18/+18
\| \| \| \| \| \| \| \| \| \|	Better names for defines, as these are visible in API include/mysql_com.h: Better names for defines, as these are visible in API VC++Files/winmysqladmin/mysql_com.h: Better names for defines, as these are visible in API
*	Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2004-08-19	5	-5/+28
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jonas/src/mysql-4.1
\| *	Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2004-08-19	2	-4/+4
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/usr/home/bar/mysql-4.1
\| \| *	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2004-08-19	2	-4/+4
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into poseidon.(none):/home/tomas/mysql-4.1
\| \| \| *	Some platfom compile/build fixes for ndb	unknown	2004-08-19	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ndb/include/kernel/Interpreter.hpp: R1 defined on some platforms ndb/include/util/BaseString.hpp: fix for compiler bug
\| * \| \|	Bug#5081: UCS2 fields are filled with '0x2020' after extending field length	unknown	2004-08-19	3	-1/+24
\| \|/ /
* \| \|	Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2004-08-19	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jonas/src/mysql-4.1
\| * \|	Set correct error code	unknown	2004-08-19	1	-1/+1
\| \| \|
* \| \|	field.cc:	unknown	2004-08-19	1	-1/+1
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Serg's typo fix :) sql/field.cc: Serg's typo fix :)
* \|	Merge bk-internal.mysql.com:/home/bk/mysql-4.1/	unknown	2004-08-19	2	-32/+54
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into serg.mylan:/usr/home/serg/Abk/mysql-4.1
\| * \	Merge gbichot@213.136.52.20:/home/bk/mysql-4.1	unknown	2004-08-19	2	-32/+54
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/mysql_src/mysql-4.1-874
\| \| *	Very small API change: changing the values in enum enum_shutdown_level;	unknown	2004-08-19	2	-32/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as this enum is not really usable yet (as MySQL server supports only one shutdown level), and as SHUTDOWN_DEFAULT is still left to 0, this change should disturb no user. Later (in 4.1.4 or 4.1.5) code will be pushed to implement graceful shutdown using this enum. VC++Files/winmysqladmin/mysql_com.h: changing the values in the enumeration enum_shutdown_level. include/mysql_com.h: changing the values in the enum enum_shutdown_level. The main one, SHUTDOWN_DEFAULT, is unchanged.
* \| \|	after merge fixes	unknown	2004-08-19	19	-88/+98
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	strings/my_vsnprintf.c: %.#s support in my_vsnprintf BitKeeper/etc/ignore: Added EXCEPTIONS-CLIENT to the ignore list
* \| \|	manually merged	unknown	2004-08-18	107	-258/+995
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-mytest-old.c~5237697b30cf59e4: Auto merged Build-tools/Bootstrap: Auto merged Build-tools/mysql-copyright: Auto merged configure.in: Auto merged BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql: Auto merged VC++Files/innobase/innobase.dsp: Auto merged client/mysql.cc: Auto merged include/my_global.h: Auto merged innobase/dict/dict0crea.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/include/mtr0log.h: Auto merged innobase/include/mtr0log.ic: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/ut0dbg.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/os/os0file.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/ut/ut0dbg.c: Auto merged innobase/ut/ut0mem.c: Auto merged libmysql/Makefile.am: Auto merged libmysql/Makefile.shared: Auto merged libmysql/conf_to_src.c: Auto merged libmysql/dll.c: Auto merged libmysql/errmsg.c: Auto merged libmysql/manager.c: Auto merged libmysql_r/Makefile.am: Auto merged myisam/mi_key.c: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/having.result: Auto merged mysql-test/r/heap.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/r/type_float.result: Auto merged mysql-test/t/having.test: Auto merged mysql-test/t/heap.test: Auto merged mysql-test/t/type_date.test: Auto merged mysql-test/t/type_float.test: Auto merged mysql-test/t/type_uint.test: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/Makefile.am: Auto merged sql/field.h: Auto merged sql/ha_heap.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_sum.h: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/protocol.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.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/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/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
\| * \|	Bug 4937: different date -> string conversion when using	unknown	2004-08-18	4	-41/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SELECT ... UNION and INSERT ... SELECT ... UNION
\| * \|	Merge bk-internal:/home/bk/mysql-4.0/	unknown	2004-08-18	7	-9/+78
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into serg.mylan:/usr/home/serg/Abk/mysql-4.0
\| \| * \|	srv0start.c, ut0mem.c, ut0dbg.c, ut0dbg.h, srv0start.h:	unknown	2004-08-18	7	-9/+78
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri) mysqld.cc, ha_innodb.cc: Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri) sql/ha_innodb.cc: Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri) sql/mysqld.cc: Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri) innobase/include/srv0start.h: Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri) innobase/include/ut0dbg.h: Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri) innobase/ut/ut0dbg.c: Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri) innobase/ut/ut0mem.c: Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri) innobase/srv/srv0start.c: Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
\| * \| \|	use my_vsnprintf() just in case	unknown	2004-08-18	1	-1/+3
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bug#4925
\| * \|	Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0	unknown	2004-08-17	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/mysql_src/mysql-4.0
\| \| * \|	Fix for BUG#5073 "--disable-local-infile has no effect if client reads it ↵	unknown	2004-08-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with MYSQL_READ_DEFAULT": that was a forgotten '~' probably. libmysql/libmysql.c: When we read "disable-local-infile" from the option file specified by mysql_options(MYSQL_READ_DEFAULT_FILE), we must take CLIENT_LOCAL_FILES down (it was probably a forgotten '~').
\| * \| \|	Merge heikki@build.mysql.com:/home/bk/mysql-4.0	unknown	2004-08-17	2	-4/+34
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into hundin.mysql.fi:/home/heikki/mysql-4.0
\| \| * \| \|	A fix (bug #5055: SQL_SELECT_LIMIT=0 crashes command line client):	unknown	2004-08-17	1	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql outwits itself.
\| \| * \| \|	A desperate attempt to comment one place where we do conversions.	unknown	2004-08-16	1	-0/+27
\| \| \|/ /
\| * \| \|	Merge heikki@build.mysql.com:/home/bk/mysql-4.0	unknown	2004-08-16	1	-0/+24
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into hundin.mysql.fi:/home/heikki/mysql-4.0
\| \| * \|	row0mysql.c:	unknown	2004-08-13	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug: if we RENAME a table, InnoDB forgot to load the foreign key constraints that reference the new table name, and forgot to check that they are compatible with the table innobase/row/row0mysql.c: Fix bug: if we RENAME a table, InnoDB forgot to load the foreign key constraints that reference the new table name, and forgot to check that they are compatible with the table
\| * \| \|	Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0	unknown	2004-08-14	1	-0/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/mysql_src/mysql-4.0
\| \| * \| \|	Fix for BUG#5050 "mysql-test-run fails on rpl_trunc_binlog after 'make ↵	unknown	2004-08-14	1	-0/+1
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	install'": The binlog files we use for some tests must be installed like other mysql-test/std_data/ files. mysql-test/Makefile.am: The binlog files we use for some tests must be installed like other mysql-test/std_data/ files. Putting a * before 001 so that it works for 6-digit extensions of 4.1.
\| * \| \|	- manual merge	unknown	2004-08-13	2	-13/+9
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Escaping [] so that darwin[7-8] gets into 'configure' and not darwin7-8	unknown	2004-08-13	2	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding a compilation define so that on recent Darwin mysqld does not react to SIGHUP and SIGQUIT: this fixes a rpl000001 problem on our Powermac G5 machine (popping after an upgrade from 10.3.4 to 10.3.5) and is expected to fix BUG#2030 "relay bin log on slave resets multiple times a second" (i.e. under some Mac OS X Panther versions, mysqld receives many SIGHUP and SIGQUIT). So this fix is more a problem-hider than a real understanding of why mysqld receives so many signals. Note that we saw other problems on this OS where mysqld reacts to Ctrl-Z but apparently only once, where using SSL seems to make the problem more frequent... configure.in: Escaping [] so that darwin[7-8] gets into 'configure' and not darwin7-8 Adding a compilation define so that on recent Darwin mysqld does not react to SIGHUP and SIGQUIT. sql/mysqld.cc: optionally ignore SIGHUP and SIGQUIT, for some Mac OS X Panther versions which send too many of those.
\| * \| \|	Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0	unknown	2004-08-13	4	-2/+98
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/space/my/mysql-4.0
\| \| * \|	Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0	unknown	2004-08-13	3	-1/+96
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0
\| \| \| * \	Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0	unknown	2004-08-13	3	-1/+96
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0 sql/sql_select.cc: Auto merged
\| \| \| \| * \|	fixed Bug #4358 Problem with HAVING clause that uses alias	unknown	2004-08-12	3	-1/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from the select list and TEXT field make setup_copy_fields to insert Item_copy_string for blobs in the beginning of the copy_funcs (push_back instead of push_front) the thing is that Item_copy_string::copy for function can call Item_copy_string::val_int for blob via Item_ref. But if Item_copy_string::copy for blob isn't called before, it's value will be wrong. So all the Item_copy_string::copy for blobs should be called before Item_copy_string::copy for functions. mysql-test/r/having.result: added test case for Bug #4358 Problem with HAVING clause that uses alias from the select list and TEXT field mysql-test/t/having.test: added test case for Bug #4358 Problem with HAVING clause that uses alias from the select list and TEXT field sql/sql_select.cc: make setup_copy_fields to insert Item_copy_string for blobs in the beginning of the copy_funcs (push_back instead of push_front) the thing is that Item_copy_string::copy for function can call Item_copy_string::val_int for blob via Item_ref. But if Item_copy_string::copy for blob isn't called before, it's value will be wrong. So all the Item_copy_string::copy for blobs should be called before Item_copy_string::copy for functions. fixed Bug #4358 Problem with HAVING clause that uses alias from the select list and TEXT field
\| \| * \| \| \|	Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0	unknown	2004-08-13	1	-1/+2
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into eagle.mysql.r18.ru:/home/vva/work/BUG_4973/mysql-4.0
\| \| \| * \ \ \	Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0	unknown	2004-08-13	1	-1/+2
\| \| \| \|\ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into eagle.mysql.r18.ru:/home/vva/work/BUG_4973/mysql-4.0
\| \| \| \| * \| \|	fixed Bug #4973 Memory is not released when HEAP table is dropped	unknown	2004-08-11	1	-1/+2
\| \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sql/ha_heap.cc: added calling fn_format(name,..) for name before heap_delete_table as it's done before heap_create fixed Bug #4973 Memory is not released when HEAP table is dropped
\| * \| \| \| \|	- portability fix for SCO Open Server 5.0.7 (thanks to Boyd Gerber)	unknown	2004-08-12	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	- Fixed two small version number issues in MySQL-shared-compat.spec	unknown	2004-08-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	support-files/MySQL-shared-compat.spec.sh: - fixed using the correct version number - bumped up the 3.23 version number to current
\| * \| \| \| \|	- giving a range does not work for platform detection in configure.in	unknown	2004-08-12	1	-1/+10
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- resorting to having to separate sections for darwin7 and darwin8 configure.in: - giving a range does not work here - resorting to having to separate sections for darwin7 and darwin8
\| * \| \| \|	Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0	unknown	2004-08-12	3	-5/+48
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/space/my/mysql-4.0
\| \| * \| \| \|	Added initial sorting in order to make test case repeatable.	unknown	2004-08-12	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Added initial sorting in order to make test case repeatable.	unknown	2004-08-12	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0	unknown	2004-08-12	3	-5/+46
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b4898
\| \| \| * \| \| \|	A test case (bug #4898: User privileges depending on ORDER BY Settings of ↵	unknown	2004-08-12	2	-0/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	table db)
\| \| \| * \| \| \|	A fix (Bug#4898: User privileges depending on ORDER BY Settings of table db)	unknown	2004-08-12	1	-5/+13
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge mysql.com:/space/my/mysql-4.0	unknown	2004-08-12	9	-16/+73
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/space/my/mysql-4.0-build
\| \| * \| \| \| \|	Merge bk-internal.mysql.com:/home/bk/mysql-4.0	unknown	2004-08-11	4	-0/+26
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug4411 BitKeeper/etc/logging_ok: auto-union
\| \| \| * \| \| \| \|	Bug#4411	unknown	2004-08-11	4	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for server hang bug mysql-test/r/heap.result: Bug#4411 Test for server hang bug mysql-test/t/heap.test: Bug#4411 Test for server hang bug sql/opt_sum.cc: Bug#4411 Allow code to exit the loop. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
\| \| * \| \| \| \| \|	Merge bk-internal:/home/bk/mysql-4.0/	unknown	2004-08-11	5	-16/+47
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into serg.mylan:/usr/home/serg/Abk/mysql-4.0
\| \| \| * \| \| \| \| \|	Bug #4797 - 32 bit and 64 bit builds behave differently on int32 overflow	unknown	2004-08-11	5	-16/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	include/my_global.h: uint_max constants moved from sql_analyse.cc sql/sql_analyse.cc: cleanup