unknown 1260bc8873 Merge xiphis.org:/home/antony/work2/wl3201.3 ... into xiphis.org:/home/antony/work2/wl3201.merge BUILD/SETUP.sh: Auto merged libmysqld/Makefile.am: Auto merged sql/ha_heap.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisammrg.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged sql/ha_partition.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged sql/partition_info.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/archive/ha_archive.cc: Auto merged storage/archive/ha_archive.h: Auto merged storage/example/ha_example.cc: Auto merged Makefile.am: Merge for WL#3201, some post-merge fixes will be required. configure.in: Merge for WL#3201 plugin/Makefile.am: Merge for WL#3201 storage/innobase/Makefile.am: Merge for WL#3201		2006-04-24 13:36:15 -07:00
..
examples	Missing file in last commit.	2006-04-03 10:28:53 +02:00
cmakelists.txt	fix cmake generation error	2006-04-10 16:06:17 -05:00
copyright	Added all changes from old 4.0 version:	2001-04-11 13:04:03 +02:00
emb_qcache.cc	Fixes to embedded server to be able to run tests with it	2006-02-24 18:34:15 +02: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	Fixes to embedded server to be able to run tests with it	2006-02-24 18:34:15 +02:00
lib_sql.cc	Remove unused variables and label	2006-04-10 18:34:18 +02:00
libmysqld.c	Fixes to embedded server to be able to run tests with it	2006-02-24 18:34:15 +02:00
libmysqld.def	Add 'mysql_get_ssl_cipher' list of functions to export from libmysqld	2006-04-11 15:14:08 +02:00
libmysqld.rc	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00
Makefile.am	Merge xiphis.org:/home/antony/work2/wl3201.3	2006-04-24 13:36:15 -07:00
resource.h	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00