unknown 7aecbab85c Merge with global tree ... BitKeeper/etc/logging_ok: auto-union client/mysql.cc: Auto merged client/mysqldump.c: Auto merged libmysql/libmysql.c: Auto merged myisam/mi_open.c: Auto merged mysql-test/r/order_by.result: Auto merged sql/filesort.cc: Auto merged sql/sql_select.cc: Auto merged mysql-test/t/order_by.test: Merge sql/sql_lex.cc: Merge sql/sql_yacc.yy: Use local copy		2005-01-18 04:03:26 +02:00
..
.cvsignore	Import changeset	2000-07-31 21:29:14 +02:00
acinclude.m4	Import changeset	2000-07-31 21:29:14 +02:00
client_settings.h	merge with 4.1	2004-10-29 19:26:52 +03:00
conf_to_src.c	manually merged	2004-08-18 19:57:55 +02:00
dll.c	manually merged	2004-08-18 19:57:55 +02:00
errmsg.c	Merge with global tree	2004-12-31 00:50:30 +02:00
get_password.c	- rename: EXCEPTIONS->EXCEPTIONS-CLIENT	2004-08-05 17:05:11 +02:00
libmysql.c	Merge with global tree	2005-01-18 04:03:26 +02:00
libmysql.def	libmysqld.def, libmysql.def:	2005-01-12 21:04:31 -06:00
Makefile.am	WL#1051, more maintanable error messages.	2004-12-13 22:51:54 +02:00
Makefile.shared	renamed charset name 'eucjp_ms' to 'eucjpms'	2005-01-12 02:58:15 -08:00
manager.c	A fix (bug #6057: Data Type Problem in manager.c).	2004-10-18 12:43:52 +05:00