unknown f3919e9284 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 ... into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge include/mysql.h: Auto merged include/sql_common.h: Auto merged libmysql/libmysql.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/t/udf.test: Auto merged ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged sql/item.cc: Auto merged sql/item_func.h: Auto merged sql/mysql_priv.h: Auto merged sql/slave.cc: Auto merged sql/sp.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_parse.cc: Auto merged sql-common/client.c: Auto merged sql/sql_yacc.yy: Auto merged sql/table.h: Auto merged mysql-test/r/ps.result: Manual merge. mysql-test/r/sp.result: Manual merge. mysql-test/t/ps.test: Manual merge. mysql-test/t/sp.test: Manual merge. sql/sql_prepare.cc: Manual merge. sql/table.cc: Manual merge. tests/mysql_client_test.c: Manual merge.		2006-08-02 14:13:01 +04: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
conf_to_src.c	manually merged	2004-08-18 19:57:55 +02:00
dll.c	manually merged	2004-08-18 19:57:55 +02: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	- rename: EXCEPTIONS->EXCEPTIONS-CLIENT	2004-08-05 17:05:11 +02:00
libmysql.c	Merge bk-internal.mysql.com:/home/bk/mysql-5.0	2006-08-02 14:13:01 +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	Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init	2006-05-31 16:19:06 +02:00
Makefile.shared	Merge 192.168.0.20:mysql/bug15069/my50-bug15069	2006-04-10 15:13:30 +02:00
manager.c	A fix (bug #6057: Data Type Problem in manager.c).	2004-10-18 12:43:52 +05:00