Auto-merge from mysql-trunk-bugfixing.
Alexander Nozdrin authored
a13f2add
Name Last commit Last update
.bzr-mysql Auto-merge from mysql-next-mr.
BUILD Merge to latest mysql-next-mr
Docs Remove .cvsignore files (attempt #2).
client Manual merge from mysql-next-mr.
cmd-line-utils Remove .cvsignore files (attempt #2).
config/ac-macros Bug#40700: aclocal warnings for missing cache-id's
dbug Use vsnprintf() rather than my_vsnprintf() in DbugVfprintf,
extra Auto-merge from mysql-trunk.
include Fix inconsistently defined THR_LOCK_myisam_mmap
libmysql Manual merge from mysql-trunk-merge.
libmysql_r Makefile.am:
libmysqld Manual merge from mysql-trunk-merge.
libservices WL#4903 Plugin Service API part I
man Remove .cvsignore files (attempt #2).
mysql-test Auto-merge from mysql-trunk-bugfixing.
mysys Manual merge from mysql-next-mr.
netware Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
plugin Auto-merge from mysql-next-mr.
pstack Makefile.am, configure.in:
regex Remove .cvsignore files (attempt #2).
scripts Manual merge from mysql-trunk-merge.
sql-bench merge fix
sql-common Backport of WL#798 (MySQL IPv6 support) from 6.0.
sql Auto-merge from mysql-next-mr.
storage Fix inconsistently defined THR_LOCK_myisam_mmap
strings
support-files
tests
unittest
vio
win
zlib
.bzrignore
CMakeLists.txt
COPYING
EXCEPTIONS-CLIENT
INSTALL-SOURCE
INSTALL-WIN-SOURCE
Makefile.am
README
configure.in