unknown bb0b7f5dda WL #1034 (Internal CRON) ... merge before push BUILD/SETUP.sh: Auto merged include/my_sys.h: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/r/ps.result: Auto merged sql/Makefile.am: Auto merged sql/lex.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sp.cc: Auto merged sql/sp.h: Auto merged sql/sp_head.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_acl.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/table.cc: Auto merged sql/tztime.cc: Auto merged libmysqld/Makefile.am: manual merge mysql-test/r/information_schema.result: manual merge sql/share/errmsg.txt: manual merge sql/sp_head.cc: manual merge sql/sql_lex.h: manual merge sql/sql_yacc.yy: manual merge		2006-01-10 21:02:19 +01:00
..
examples	Merge mysql.com:/usr/local/bk/mysql-5.0	2005-11-28 20:14:12 +01: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
event.h	add these, forgotten in the previous commit	2005-12-02 13:22:15 +01: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	WL #1034 (Internal CRON)	2006-01-10 21:02:19 +01:00
resource.h	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00