Alexander Nozdrin 6f8073497c Manual merge from mysql-next-mr. ... Conflicts: - storage/ibmdb2i/ha_ibmdb2i.cc		2009-12-22 09:32:58 +03:00
..
acinclude.m4	Import changeset	2000-07-31 21:29:14 +02:00
client_settings.h	Disable WL#4435.	2009-11-17 17:05:36 +01:00
CMakeLists.txt	Backport of:	2009-10-16 01:11:42 +04:00
conf_to_src.c	manually merged	2004-08-18 19:57:55 +02:00
dll.c	Bug#37226 Explicit call of my_thread_init() on Windows for every new thread.	2008-09-01 17:46:37 -04:00
errmsg.c	Merge from mysql-next-mr.	2009-10-23 15:22:21 +04:00
get_password.c	fixes for build failures due to my yesterday's changeset forbidding	2008-02-19 18:45:11 +01:00
libmysql.c	Manual merge from mysql-trunk-merge.	2009-12-16 21:02:21 +03:00
libmysql.def	Manual merge from mysql-trunk.	2009-12-11 12:39:38 +03:00
libmysql.ver.in	BUG#3074: Unversioned symbols in shared library	2006-01-17 18:51:08 +04:00
Makefile.am	WL#2360 Performance schema	2009-11-30 17:49:15 -07:00
Makefile.shared	WL#2360 Performance schema	2009-11-30 17:49:15 -07:00