Fix merge error.
Jan Lindström authored
4521a532
Name Last commit Last update
BUILD MDEV-6247: Merge 10.0-galera to 10.1.
Docs MDEV-6247: Merge 10.0-galera to 10.1.
client MDEV-6247: Merge 10.0-galera to 10.1.
cmake MDEV-6247: Merge 10.0-galera to 10.1.
cmd-line-utils mysql-5.5.32 merge
dbug 5.5.38 merge
debian MDEV-6247: Merge 10.0-galera to 10.1.
extra MDEV-6248 GUI-friendly cmake options to enable/disable plugins
include Review fixes.
libmysql 5.5.38 merge
libmysqld Moving implementation of INET_ATON() INET_NTOA() into
libservices harmless typo fixed
man 5.5.38 merge
mysql-test MDEV-6247: Merge 10.0-galera to 10.1.
mysys Review fixes.
mysys_ssl Do the partial merge of WL#5602 correctly:
packaging cmake: prefer INSTALL(PROGRAMS over INSTALL(FILES
pcre pcre-8.35
plugin MDEV-6247: Merge 10.0-galera to 10.1.
randgen/conf Group commit for maria engine.
scripts Review fixes.
sql-bench MDEV-4447 MariaDB sources should have unix-style line endings everywhere
sql-common 5.5.38 merge
sql Fix merge error.
storage Review fixes.
strings
support-files
tests
unittest
vio
win
wsrep
zlib
.bzrignore
.gitignore
BUILD-CMAKE
CMakeLists.txt
COPYING
COPYING.LESSER
COPYING.thirdparty
CREDITS
EXCEPTIONS-CLIENT
INSTALL-SOURCE
INSTALL-WIN-SOURCE
KNOWN_BUGS.txt
README
VERSION
config.h.cmake
configure.cmake