Alexey Kopytov d2452095a5 Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. ... Conflicts: Text conflict in .bzr-mysql/default.conf Text conflict in mysql-test/r/explain.result Text conflict in mysql-test/r/having.result Text conflict in mysql-test/suite/rpl/t/disabled.def Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test Text conflict in storage/federated/ha_federated.cc		2010-03-07 19:40:59 +03:00
..
acinclude.m4
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
dll.c
errmsg.c	Merge from mysql-next-mr.	2009-10-23 15:22:21 +04:00
get_password.c
libmysql.c	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	2010-03-07 19:40:59 +03:00
libmysql.def	Manual merge from mysql-trunk.	2009-12-11 12:39:38 +03:00
libmysql.ver.in
Makefile.am	Bug #43397 mysql headers redefine pthread_mutex_init	2009-07-08 16:49:45 +02:00
Makefile.shared	Backport of:	2009-10-16 00:53:21 +04:00