merge

CMakeLists.txt

@@ -278,6 +278,7 @@ ENDIF()
 SET(MYSQL_DOCS_LOCATION "" CACHE PATH "Location from where documentation is copied")
 MARK_AS_ADVANCED(MYSQL_DOCS_LOCATION)
 INSTALL(DIRECTORY Docs/ DESTINATION ${INSTALL_DOCDIR}
+  PATTERN "INSTALL-BINARY" EXCLUDE
   PATTERN "Makefile.*" EXCLUDE
   PATTERN "myisam.txt" EXCLUDE
   PATTERN "glibc*" EXCLUDE

cmake/build_configurations/mysql_release.cmake

@@ -80,6 +80,8 @@ IF(FEATURE_SET)
   ENDFOREACH()
 ENDIF()
 
+SET(WITHOUT_AUDIT_NULL ON CACHE BOOL "")
+SET(WITHOUT_DAEMON_EXAMPLE ON CACHE BOOL "")
 
 OPTION(ENABLE_LOCAL_INFILE "" ON)
 SET(WITH_SSL bundled CACHE STRING "")

cmake/install_layout.cmake

@@ -80,7 +80,7 @@ ENDIF()
  SET(INSTALL_LIBDIR_STANDALONE "lib")
  SET(INSTALL_INCLUDEDIR_STANDALONE "include")
  SET(INSTALL_PLUGINDIR_STANDALONE "lib/plugin")
- SET(INSTALL_DOCDIR_STANDALONE "doc")
+ SET(INSTALL_DOCDIR_STANDALONE "docs")
  SET(INSTALL_MANDIR_STANDALONE "man")
  SET(INSTALL_MYSQLSHAREDIR_STANDALONE "share")
  SET(INSTALL_SHAREDIR_STANDALONE "share")

mysql-test/CMakeLists.txt

@@ -23,6 +23,7 @@ INSTALL(
  PATTERN "mtr.out*" EXCLUDE
  PATTERN ".cvsignore" EXCLUDE
  PATTERN "*.am" EXCLUDE
+ PATTERN "*.in" EXCLUDE
 )
 
 

mysql-test/r/perror-win.result

@@ -2,5 +2,6 @@ MySQL error code 150: Foreign key constraint is incorrectly formed
 Win32 error code 150: System trace information was not specified in your CONFIG.SYS file, or tracing is disallowed.
 OS error code  23:  Too many open files in system
 Win32 error code 23: Data error (cyclic redundancy check).
+MySQL error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192s' for key %d
 Win32 error code 1062: The service has not been started.
 Illegal error code: 30000

mysql-test/t/perror.test

+--source include/not_windows.inc
 #
 # Check if the variable MY_PERROR is set
 #

sql/CMakeLists.txt

@@ -191,7 +191,14 @@ ADD_CUSTOM_COMMAND(
   COMMAND ${CMAKE_COMMAND} -E remove -f lex_hash.h.tmp
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gen_lex_hash.cc)
-        
+
+MYSQL_ADD_EXECUTABLE(mysql_tzinfo_to_sql tztime.cc)
+SET_TARGET_PROPERTIES(mysql_tzinfo_to_sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL")
+TARGET_LINK_LIBRARIES(mysql_tzinfo_to_sql ${MYSQLD_STATIC_PLUGIN_LIBS} 
+  mysys dbug strings vio regex   
+  ${LIBWRAP} ${LIBCRYPT} ${LIBDL}
+  ${SSL_LIBRARIES})
+
 ADD_CUSTOM_TARGET( 
         GenServerSource
         DEPENDS ${GEN_SOURCES}

sql/share/CMakeLists.txt

@@ -47,6 +47,8 @@ FOREACH (dir ${dirs})
  INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dir} 
   DESTINATION  ${INSTALL_MYSQLSHAREDIR})
 ENDFOREACH()
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/charsets DESTINATION ${INSTALL_MYSQLSHAREDIR})
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/charsets DESTINATION ${INSTALL_MYSQLSHAREDIR}
+  PATTERN "languages.html" EXCLUDE
+)
 
 INSTALL(FILES ${files} DESTINATION ${INSTALL_MYSQLSHAREDIR})