unknown 7b0069ee20 merged ... BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union client/Makefile.am: Auto merged client/mysqlbinlog.cc: Auto merged configure.in: Auto merged include/my_time.h: Auto merged innobase/fil/fil0fil.c: Auto merged innobase/include/fil0fil.h: Auto merged libmysql/libmysql.c: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/func_group.test: Auto merged mysql-test/t/func_time.test: Auto merged sql/field.cc: Auto merged sql/ha_ndbcluster.h: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_prepare.cc: Auto merged tests/client_test.c: Auto merged		2004-11-20 18:36:41 +01:00
..
.cvsignore
config-netware.h
config-os2.h
config-win.h	Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa	2004-11-11 13:44:10 +01:00
decimal.h	take into accound end \0 in decimal_string_size	2004-11-03 22:30:37 +01:00
errmsg.h	client.c, libmysql.c:	2004-06-30 22:18:41 -05:00
ft_global.h
hash.h	After merge fixes	2004-10-07 10:50:13 +03:00
heap.h	Fix for bug#5138 continued: added comments, removed extra debug printf calls, changed ha_heap::records_in_range to use table->rec_per_key.	2004-10-12 18:21:25 +04:00
help_end.h
help_start.h
keycache.h
m_ctype.h	Bug #6040 can't retrieve records with umlaut characters in case insensitive manner	2004-10-18 15:23:24 +05:00
m_string.h	If the system has 64 bit "long", then "long long" does not add new	2004-08-30 17:41:41 +02:00
Makefile.am	fix problem with make dist and decimal.h	2004-11-04 13:07:38 +01:00
md5.h
merge.h
my_aes.h
my_alarm.h
my_alloc.h
my_base.h	merge with 4.1	2004-10-29 19:26:52 +03:00
my_bitmap.h
my_dbug.h	Merge bk-internal:/home/bk/mysql-5.0	2004-11-15 19:27:06 +01:00
my_dir.h
my_getopt.h	Merge with 4.0	2004-09-01 04:12:09 +03:00
my_global.h	Merge	2004-11-16 00:04:12 +01:00
my_handler.h
my_list.h	one more name clash in public includes fixed	2004-11-02 22:46:55 +01:00
my_net.h
my_no_pthread.h
my_nosys.h
my_pthread.h	#warning removed	2004-11-17 14:38:01 +01:00
my_semaphore.h
my_sys.h	Merge bk-internal:/home/bk/mysql-5.0	2004-11-15 19:27:06 +01:00
my_time.h	merged	2004-11-20 18:36:41 +01:00
my_tree.h
my_xml.h
myisam.h	Merge with 4.0 for 4.1 release	2004-10-06 19:14:33 +03:00
myisammrg.h
myisampack.h	Casted all macro arguments,	2004-07-28 21:46:22 +02:00
mysql.h	Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)	2004-11-11 18:58:57 -08:00
mysql_com.h	Merge with 4.1 to get in latest bug fixes	2004-11-04 15:06:24 +02:00
mysql_embed.h
mysql_time.h	Fix for bug #6266 "Invalid DATETIME value is not handled properly".	2004-11-15 15:44:29 +03:00
mysql_version.h.in
mysqld_error.h	now my_printf_error is not better then my_error, but my_error call is shorter	2004-11-13 19:35:51 +02:00
mysys_err.h
nisam.h
queues.h
raid.h
rijndael.h
sha1.h
sql_common.h	Remove stale declaration, fix a typo in comment.	2004-10-15 22:03:11 +04:00
sql_state.h	Fixed BUG#6030: Stored procedure has no appropriate DROP privilege.	2004-10-22 20:29:06 +02:00
sslopt-case.h
sslopt-longopts.h
sslopt-vars.h
t_ctype.h
thr_alarm.h
thr_lock.h
typelib.h	Bug#6202: ENUMs are not case sensitive even if declared BINARY	2004-10-25 17:51:26 +05:00
violite.h