unknown f2b41e6886 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 ... into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean configure.in: Auto merged mysql-test/mysql-test-run.sh: Auto merged scripts/mysql_create_system_tables.sh: Auto merged scripts/mysql_fix_privilege_tables.sql: Auto merged sql/ha_innodb.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged		2005-05-03 00:10:52 +02:00
..
examples	- manual merge	2005-04-21 08:30:59 +02:00
copyright	Added all changes from old 4.0 version:	2001-04-11 13:04:03 +02:00
emb_qcache.cc	Fix crash in embedded server due to incorrect storage of results	2005-03-31 19:17:45 -08:00
emb_qcache.h	Fix crash in embedded server due to incorrect storage of results	2005-03-31 19:17:45 -08:00
embedded_priv.h	Proposed fix for #3744 (embedded server, wrong error message if database is	2004-05-17 12:05:57 +05:00
lib_sql.cc	BUG#9391 mysqlshow prints incorrect "rows" information	2005-04-13 12:22:20 +02:00
libmysqld.c	fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file)	2005-01-03 19:21:54 +04:00
libmysqld.def	Fix test_libmysqld link problem on Windows.	2005-03-21 21:51:31 +01:00
libmysqld.rc	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00
Makefile.am	All changes for change to all storage engines being under storage directory.	2005-04-26 19:04:36 -07:00
resource.h	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00