unknown 4175806efc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 ... into bodhi.(none):/opt/local/work/mysql-5.1-27430 Makefile.am: Auto merged include/my_global.h: Auto merged mysql-test/include/mix1.inc: Auto merged sql/item.cc: Auto merged sql/my_decimal.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_head.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/share/errmsg.txt: Auto merged sql/sql_yacc.yy: Auto merged libmysqld/CMakeLists.txt: Manual merge. libmysqld/lib_sql.cc: Manual merge. mysql-test/t/disabled.def: Manual merge.		2008-05-20 11:38:17 +04:00
..
examples	Bug#32044 some of the tests (backup, drop, query_cache, etc) will timeout on Windows	2007-11-02 09:27:38 +01:00
CMakeLists.txt	fixed the win64 build failure	2008-05-13 15:29:08 +03:00
copyright
emb_qcache.cc	Merge station.:/mnt/raid/alik/MySQL/devel/5.1	2007-12-14 16:30:22 +03:00
emb_qcache.h	Merge station.:/mnt/raid/alik/MySQL/devel/5.1	2007-12-14 16:30:22 +03:00
embedded_priv.h	my_strtoll10-x86.s:	2006-12-31 01:02:27 +01:00
lib_sql.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	2008-05-20 11:38:17 +04:00
libmysqld.c	Bug#34655 Compile error	2008-02-28 14:55:46 -03:00
libmysqld.def	Merge mysql.com:/Users/davi/mysql/bugs/29592-5.0	2007-11-26 16:10:26 -02:00
libmysqld.rc	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00
Makefile.am	Bug#35997 Event scheduler seems to let the server crash, if it is embedded.	2008-05-09 09:43:02 +02:00
resource.h	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00