Alexey Kopytov 6e7b8b6a7a 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

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 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

BUG#3074: Unversioned symbols in shared library

2006-01-17 18:51:08 +04:00

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