unknown 848235f797 Merge BUG#15110 from 5.0 into 5.1. ... Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110 BitKeeper/etc/ignore: auto-union client/mysqldump.c: Auto merged include/mysql_com.h: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/type_time.result: Auto merged sql/Makefile.am: Auto merged sql/sp.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_trigger.cc: Auto merged client/Makefile.am: Add my_user.c include/Makefile.am: Add my_user.c libmysqld/Makefile.am: Add my_user.c mysql-test/t/disabled.def: Enable type_time.test sql/sql_parse.cc: Merge.		2006-01-13 19:09:27 +03:00
..
examples	Merge mysql.com:/usr/local/bk/mysql-5.0	2005-11-28 20:14:12 +01:00
copyright
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	Fix for bug #13546 "Build errors with --with-embedded-server	2005-09-28 18:43:46 +04:00
libmysqld.c	Fix for bug #9632 (strict.test fails in -embedded-server mode)	2005-05-09 16:26:06 +05:00
libmysqld.def	Fixes to previous changeset	2005-07-18 20:05:30 +03:00
libmysqld.rc	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00
Makefile.am	Merge BUG#15110 from 5.0 into 5.1.	2006-01-13 19:09:27 +03:00
resource.h	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00