unknown 6339053d9d merging ... include/mysql_com.h: Auto merged include/mysqld_error.h: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/r/subselect.result: Auto merged sql/Makefile.am: Auto merged sql/filesort.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_sum.cc: Auto merged sql/share/czech/errmsg.txt: Auto merged sql/sql_base.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/dutch/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/german/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/serbian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged		2002-11-27 19:31:11 +02:00
..
examples	fix for BDB 4.1.24	2002-10-31 17:06:23 +04:00
copyright	Added all changes from old 4.0 version:	2001-04-11 13:04:03 +02:00
embedded_priv.h	New SET syntax & system variables.	2002-07-23 18:31:22 +03:00
lib_sql.cc	Merge with 4.0	2002-11-21 15:56:48 +02:00
lib_vio.c	Fix after merge	2002-08-08 16:41:04 +03:00
libmysqld.c	Added some compatibility modes (for the future)	2002-11-20 21:44:32 +02:00
libmysqld.def	Removed mysql_ssl_clear()	2002-06-27 11:27:04 +03:00
Makefile.am	merging	2002-11-27 19:31:11 +02:00