unknown 90feb661d5 Merge mysql.com:/home/kent/bk/mysql-5.0 ... into mysql.com:/home/kent/bk/mysql-5.1 BitKeeper/deleted/.del-gen_rec.awk: Auto merged client/mysql_upgrade.c: Auto merged configure.in: Auto merged extra/yassl/src/Makefile.am: Auto merged extra/yassl/taocrypt/benchmark/Makefile.am: Auto merged extra/yassl/taocrypt/benchmark/benchmark.dsp: Auto merged extra/yassl/taocrypt/src/Makefile.am: Auto merged extra/yassl/taocrypt/taocrypt.dsp: Auto merged extra/yassl/taocrypt/taocrypt.vcproj: Auto merged extra/yassl/taocrypt/test.dsp: Auto merged extra/yassl/taocrypt/test/Makefile.am: Auto merged extra/yassl/testsuite/Makefile.am: Auto merged extra/yassl/testsuite/testsuite.dsp: Auto merged extra/yassl/yassl.dsp: Auto merged extra/yassl/yassl.vcproj: Auto merged include/my_sys.h: Auto merged libmysql/Makefile.shared: Auto merged mysql-test/mysql-test-run.pl: Auto merged BitKeeper/deleted/.del-ha_berkeley.m4: Auto merged mysql-test/lib/mtr_report.pl: Auto merged sql-common/my_time.c: Auto merged storage/ndb/config/common.mk.am: Auto merged storage/ndb/config/type_kernel.mk.am: Auto merged storage/ndb/config/type_ndbapi.mk.am: Auto merged storage/ndb/config/type_ndbapitest.mk.am: Auto merged storage/ndb/config/type_ndbapitools.mk.am: Auto merged storage/ndb/config/type_util.mk.am: Auto merged Docs/Makefile.am: SCCS merged		2006-11-27 23:12:05 +01:00
..
.cvsignore	Import changeset	2000-07-31 21:29:14 +02:00
acinclude.m4	Import changeset	2000-07-31 21:29:14 +02:00
client_settings.h	Fixed Bug#7838, "pipe_sig_handler should be static".	2005-02-17 23:00:48 +02:00
CMakeLists.txt	Additional files for cmake support	2006-08-31 19:52:42 +02:00
conf_to_src.c	manually merged	2004-08-18 19:57:55 +02:00
dll.c	Final patch to remove the last of the OS2 support.	2006-04-15 18:17:32 -07:00
errmsg.c	A fix and a test case for Bug#9643 " CURSOR_TYPE_SCROLLABLE dos not work"	2005-05-16 18:27:21 +04:00
get_password.c	This is an implementation of two WL items:	2006-05-18 18:57:50 +04:00
libmysql.c	Merge bodhi.local:/opt/local/work/tmp_merge	2006-08-12 21:06:51 +04:00
libmysql.def	Backport fix for mysql client not using SSl library directly	2006-04-22 00:48:13 +02:00
libmysql.ver.in	BUG#3074: Unversioned symbols in shared library	2006-01-17 18:51:08 +04:00
Makefile.am	make dist changes for Cmake build	2006-09-01 10:32:12 +02:00
Makefile.shared	ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4:	2006-11-27 21:15:25 +01:00
manager.c	Final patch to remove the last of the OS2 support.	2006-04-15 18:17:32 -07:00
mytest.c	make dist changes for Cmake build	2006-09-01 10:32:12 +02:00