unknown 5bb9169118 Manual merge 5.0->5.1 ... BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged mysql-test/mysql-test-run.sh: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged storage/innobase/include/lock0lock.h: Auto merged storage/innobase/include/srv0srv.h: Auto merged storage/innobase/lock/lock0lock.c: Auto merged storage/innobase/srv/srv0srv.c: Auto merged storage/ndb/test/src/NDBT_ResultRow.cpp: Auto merged sql/slave.cc: Due to refactoring, this needs to be checked before the call. sql/sql_acl.cc: Resolving conflicts due to bug fix and filter refactoring		2005-05-06 15:04:07 +02:00
..
yassl	gcc 2.92 compatibility	2005-05-05 16:21:17 +02:00
.cvsignore	Import changeset	2000-07-31 21:29:14 +02:00
charset2html.c	dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features	2004-11-04 22:29:00 +01:00
comp_err.c	Remove compiler warnings and remove not used variables	2005-02-25 16:53:22 +02:00
Makefile.am	WL#2286 Compile MySQL w/YASSL support	2005-04-28 18:23:27 +05:00
my_print_defaults.c	Merge mysql.com:/home/jimw/my/mysql-5.0-5354	2005-05-02 10:20:22 -07:00
mysql_waitpid.c	Added global my_getopt_error_reporter function pointer which is	2004-08-31 21:27:58 +05:00
perror.c	All changes for change to all storage engines being under storage directory.	2005-04-26 19:04:36 -07:00
replace.c	Merge commit trigger	2005-02-10 14:32:01 -08:00
resolve_stack_dump.c	Applied a patch for Netware.	2005-02-08 19:49:40 +02:00
resolveip.c	Merge with 4.0	2004-09-01 04:12:09 +03:00