Manual merge from mysql-next-mr.
Conflicts: - mysql-test/r/mysqld--help-notwin.result - mysql-test/r/mysqld--help-win.result
Showing
BUILD-CMAKE
0 → 100644
BUILD/choose_configure.sh
0 → 100644
This diff is collapsed.
cmake/Makefile.am
0 → 100644
cmake/abi_check.cmake
0 → 100644
cmake/bison.cmake
0 → 100644
cmake/cat.cmake
0 → 100644
cmake/character_sets.cmake
0 → 100644
cmake/configure.pl
0 → 100644
cmake/do_abi_check.cmake
0 → 100644
cmake/dtrace.cmake
0 → 100644
cmake/dtrace_prelink.cmake
0 → 100644
cmake/install_layout.cmake
0 → 100755
cmake/install_macros.cmake
0 → 100644
cmake/libutils.cmake
0 → 100644
This diff is collapsed.
cmake/make_dist.cmake.in
0 → 100644
cmake/mysql_version.cmake
0 → 100644
cmake/os/AIX.cmake
0 → 100644
cmake/os/Cygwin.cmake
0 → 100644
cmake/os/Darwin.cmake
0 → 100644
cmake/os/FreeBSD.cmake
0 → 100644
cmake/os/HP-UX.cmake
0 → 100644
cmake/os/Linux.cmake
0 → 100644
cmake/os/OS400.cmake
0 → 100644
cmake/os/SunOS.cmake
0 → 100644
cmake/os/Windows.cmake
0 → 100644
cmake/os/WindowsCache.cmake
0 → 100644
This diff is collapsed.
cmake/package_name.cmake
0 → 100644
cmake/plugin.cmake
0 → 100644
cmake/readline.cmake
0 → 100644
cmake/ssl.cmake
0 → 100644
cmake/stack_direction.c
0 → 100644
cmake/versioninfo.rc.in
0 → 100644
cmake/zlib.cmake
0 → 100644
This diff is collapsed.
config.h.cmake
0 → 100644
This diff is collapsed.
configure.cmake
0 → 100644
This diff is collapsed.
This diff is collapsed.
include/CMakeLists.txt
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
man/CMakeLists.txt
0 → 100644
This diff is collapsed.
This diff is collapsed.
mysql-test/CMakeLists.txt
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
mysql-test/mtr.out-of-source
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
sql-bench/CMakeLists.txt
0 → 100644
This diff is collapsed.
This diff is collapsed.
sql/CMakeLists.txt
100644 → 100755
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
sql/main.cc
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
sql/share/CMakeLists.txt
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
support-files/CMakeLists.txt
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment