unknown 44070705ea merge with 4.0 ... BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-Makefile.am: Delete: Docs/Images/Makefile.am Build-tools/Bootstrap: Auto merged Docs/Makefile.am: Auto merged configure.in: Auto merged include/mysql.h: Auto merged innobase/dict/dict0dict.c: Auto merged libmysql/libmysql.c: Auto merged mysys/default.c: Auto merged scripts/mysqld_safe.sh: Auto merged sql/log.cc: Auto merged mysql-test/t/mix_innodb_myisam_binlog.test: Auto merged sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_table.cc: Auto merged client/mysqldump.c: merge with 4.0 (This only reorders options) sql/ha_innodb.cc: merge with 4.0 (Keep original code) sql/time.cc: Note that part of this patch is done in my_time.c		2004-11-12 11:17:53 +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	Fix compiler warnings (detected by Intel's C++ compiler)	2004-10-22 18:44:51 +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 mysql.com:/home/wax/mysql/mysql-4.1	2004-08-19 19:41:30 +06:00
get_password.c	- rename: EXCEPTIONS->EXCEPTIONS-CLIENT	2004-08-05 17:05:11 +02:00
libmysql.c	libmysql.c:	2004-11-05 09:07:07 +04:00
libmysql.def	libmysql.def, libmysql.c:	2004-11-05 09:00:04 +04:00
Makefile.am	merge with 4.0	2004-11-12 11:17:53 +02:00
Makefile.shared	Activating the new string->number conversion functions	2004-09-25 17:20:50 +05:00
manager.c	A fix (bug #6057: Data Type Problem in manager.c).	2004-10-18 12:43:52 +05:00