Attachment 133630 Details for Bug 178125 – file.shar

file.shar

file.shar (text/plain), 18.31 KB, created by Andrei Lavreniyuk on 2013-04-25 07:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrei Lavreniyuk

Created: 2013-04-25 07:20:00 UTC

Size: 18.31 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	mysql56-client-cluster
>#	mysql56-client-cluster/pkg-plist
>#	mysql56-client-cluster/Makefile
>#	mysql56-client-cluster/files
>#	mysql56-client-cluster/files/patch-client_CMakeLists.txt
>#	mysql56-client-cluster/files/patch-include_myisam.h
>#	mysql56-client-cluster/files/patch-mysys_ssl_my_default.cc
>#	mysql56-client-cluster/files/patch-scripts_CMakeLists.txt
>#	mysql56-client-cluster/files/patch-support-files_CMakeLists.txt
>#	mysql56-client-cluster/files/patch-CMakeLists.txt
>#	mysql56-client-cluster/files/patch-include_my_compare.h
>#	mysql56-client-cluster/files/patch-extra_yassl_taocrypt_src_integer.cpp
>#	mysql56-client-cluster/files/patch-cmake_readline.cmake
>#	mysql56-client-cluster/files/patch-man_CMakeLists.txt
>#	mysql56-client-cluster/files/patch-extra_CMakeLists.txt
>#
>echo c - mysql56-client-cluster
>mkdir -p mysql56-client-cluster > /dev/null 2>&1
>echo x - mysql56-client-cluster/pkg-plist
>sed 's/^X//' >mysql56-client-cluster/pkg-plist << '5c3b0dbeb06f37f97a482f09536c0817'
>Xbin/msql2mysql
>Xbin/mysql
>Xbin/mysql_config
>Xbin/mysql_config_editor
>Xbin/mysql_find_rows
>Xbin/mysql_waitpid
>Xbin/mysqlaccess
>Xbin/mysqlaccess.conf
>Xbin/mysqladmin
>Xbin/mysqlbinlog
>Xbin/mysqlcheck
>Xbin/mysqldump
>Xbin/mysqlimport
>Xbin/mysqlshow
>Xbin/mysqlslap
>Xinclude/mysql/big_endian.h
>Xinclude/mysql/byte_order_generic.h
>Xinclude/mysql/byte_order_generic_x86.h
>Xinclude/mysql/byte_order_generic_x86_64.h
>Xinclude/mysql/decimal.h
>Xinclude/mysql/errmsg.h
>Xinclude/mysql/keycache.h
>Xinclude/mysql/little_endian.h
>Xinclude/mysql/m_ctype.h
>Xinclude/mysql/m_string.h
>Xinclude/mysql/my_alloc.h
>Xinclude/mysql/my_attribute.h
>Xinclude/mysql/my_byteorder.h
>Xinclude/mysql/my_compiler.h
>Xinclude/mysql/my_config.h
>Xinclude/mysql/my_dbug.h
>Xinclude/mysql/my_dir.h
>Xinclude/mysql/my_getopt.h
>Xinclude/mysql/my_global.h
>Xinclude/mysql/my_list.h
>Xinclude/mysql/my_net.h
>Xinclude/mysql/my_pthread.h
>Xinclude/mysql/my_sys.h
>Xinclude/mysql/my_xml.h
>Xinclude/mysql/mysql.h
>Xinclude/mysql/mysql/client_authentication.h
>Xinclude/mysql/mysql/client_plugin.h
>Xinclude/mysql/mysql/client_plugin.h.pp
>Xinclude/mysql/mysql/get_password.h
>Xinclude/mysql/mysql/innodb_priv.h
>Xinclude/mysql/mysql/plugin.h
>Xinclude/mysql/mysql/plugin_audit.h
>Xinclude/mysql/mysql/plugin_audit.h.pp
>Xinclude/mysql/mysql/plugin_auth.h
>Xinclude/mysql/mysql/plugin_auth.h.pp
>Xinclude/mysql/mysql/plugin_auth_common.h
>Xinclude/mysql/mysql/plugin_ftparser.h
>Xinclude/mysql/mysql/plugin_ftparser.h.pp
>Xinclude/mysql/mysql/plugin_validate_password.h
>Xinclude/mysql/mysql/psi/mysql_file.h
>Xinclude/mysql/mysql/psi/mysql_idle.h
>Xinclude/mysql/mysql/psi/mysql_socket.h
>Xinclude/mysql/mysql/psi/mysql_stage.h
>Xinclude/mysql/mysql/psi/mysql_statement.h
>Xinclude/mysql/mysql/psi/mysql_table.h
>Xinclude/mysql/mysql/psi/mysql_thread.h
>Xinclude/mysql/mysql/psi/psi.h
>Xinclude/mysql/mysql/service_my_plugin_log.h
>Xinclude/mysql/mysql/service_my_snprintf.h
>Xinclude/mysql/mysql/service_mysql_string.h
>Xinclude/mysql/mysql/service_thd_alloc.h
>Xinclude/mysql/mysql/service_thd_wait.h
>Xinclude/mysql/mysql/service_thread_scheduler.h
>Xinclude/mysql/mysql/services.h
>Xinclude/mysql/mysql/thread_pool_priv.h
>Xinclude/mysql/mysql_com.h
>Xinclude/mysql/mysql_com_server.h
>Xinclude/mysql/mysql_embed.h
>Xinclude/mysql/mysql_time.h
>Xinclude/mysql/mysql_version.h
>Xinclude/mysql/mysqld_ername.h
>Xinclude/mysql/mysqld_error.h
>Xinclude/mysql/plugin.h
>Xinclude/mysql/plugin_audit.h
>Xinclude/mysql/plugin_ftparser.h
>Xinclude/mysql/plugin_validate_password.h
>Xinclude/mysql/sql_common.h
>Xinclude/mysql/sql_state.h
>Xinclude/mysql/sslopt-case.h
>Xinclude/mysql/sslopt-longopts.h
>Xinclude/mysql/sslopt-vars.h
>Xinclude/mysql/typelib.h
>Xlib/mysql/libmysqlclient.a
>Xlib/mysql/libmysqlclient.so
>Xlib/mysql/libmysqlclient.so.18
>Xlib/mysql/libmysqlclient_r.a
>Xlib/mysql/libmysqlclient_r.so
>Xlib/mysql/libmysqlclient_r.so.18
>Xlib/mysql/libmysqlservices.a
>Xshare/aclocal/mysql.m4
>X@dirrm include/mysql/mysql/psi
>X@dirrm include/mysql/mysql
>X@dirrm include/mysql
>X@dirrmtry lib/mysql
>5c3b0dbeb06f37f97a482f09536c0817
>echo x - mysql56-client-cluster/Makefile
>sed 's/^X//' >mysql56-client-cluster/Makefile << 'f0b6ae0514c8a0a4c80e6ac056c52777'
>X# Created by: Andrei Lavreniyuk <andy.lavr@gmail.com>
>X# $FreeBSD$
>X
>XPORTNAME=	mysql
>XPKGNAMESUFFIX=	-client-cluster
>X
>XCOMMENT=	Multithreaded SQL database Cluster (client)
>X
>XMASTERDIR=	${.CURDIR}/../mysql56-server-cluster
>X
>XPKGMESSAGE=	mustnotexist
>XPATCHDIR=	${.CURDIR}/files
>XPLIST=		${.CURDIR}/pkg-plist
>X
>XLATEST_LINK=	mysql56-client-cluster
>X
>XCONFLICTS_INSTALL=	mysql-client-[345].* mariadb-client-5.* percona-client-5.*
>X
>XCMAKE_ARGS+=	-DWITHOUT_SERVER=1
>X
>XUSE_LDCONFIG=	${PREFIX}/lib/mysql
>X
>XMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
>X		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
>X		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
>X
>XCLIENT_ONLY=	yes
>X
>X.include "${MASTERDIR}/Makefile"
>f0b6ae0514c8a0a4c80e6ac056c52777
>echo c - mysql56-client-cluster/files
>mkdir -p mysql56-client-cluster/files > /dev/null 2>&1
>echo x - mysql56-client-cluster/files/patch-client_CMakeLists.txt
>sed 's/^X//' >mysql56-client-cluster/files/patch-client_CMakeLists.txt << 'fc9f0b08e313b0740aab0d75667a9575'
>X--- client/CMakeLists.txt.orig	2013-01-22 17:54:50.000000000 +0100
>X+++ client/CMakeLists.txt	2013-02-13 10:36:50.000000000 +0100
>X@@ -39,9 +39,11 @@
>X   TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
>X ENDIF(UNIX)
>X 
>X+IF(FALSE)
>X MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
>X SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
>X TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
>X+ENDIF()
>X 
>X 
>X MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
>X@@ -53,15 +55,19 @@
>X MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
>X TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
>X 
>X+IF(FALSE)
>X MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
>X TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
>X ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
>X+ENDIF()
>X 
>X MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
>X TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
>X 
>X+IF(FALSE)
>X MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
>X TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
>X+ENDIF()
>X 
>X MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
>X TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
>X@@ -82,8 +88,6 @@
>X ENDIF(WIN32)
>X 
>X SET_TARGET_PROPERTIES (
>X-  mysql_plugin 
>X-  mysql_upgrade
>X   mysqlcheck
>X   mysqldump
>X   mysqlimport
>fc9f0b08e313b0740aab0d75667a9575
>echo x - mysql56-client-cluster/files/patch-include_myisam.h
>sed 's/^X//' >mysql56-client-cluster/files/patch-include_myisam.h << '254b1fd5336d80884c88474ff65798b1'
>X--- include/myisam.h.orig	2009-02-16 23:04:54.000000000 +0100
>X+++ include/myisam.h	2009-02-16 23:10:08.000000000 +0100
>X@@ -48,7 +48,7 @@
>X   The following defines can be increased if necessary.
>X   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
>X */
>X-#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
>X+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
>X #define MI_MAX_KEY_SEG              16              /* Max segments for key */
>X 
>X #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
>254b1fd5336d80884c88474ff65798b1
>echo x - mysql56-client-cluster/files/patch-mysys_ssl_my_default.cc
>sed 's/^X//' >mysql56-client-cluster/files/patch-mysys_ssl_my_default.cc << 'b823232b4a4cdcfcfbd887a5b64c7c88'
>X--- mysys_ssl/my_default.cc.orig	2013-01-22 17:54:49.000000000 +0100
>X+++ mysys_ssl/my_default.cc	2013-02-13 11:08:15.000000000 +0100
>X@@ -119,7 +119,7 @@
>X 
>X /* Which directories are searched for options (and in which order) */
>X 
>X-#define MAX_DEFAULT_DIRS 6
>X+#define MAX_DEFAULT_DIRS 7
>X #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
>X static const char **default_directories = NULL;
>X 
>X@@ -1395,7 +1395,10 @@
>X 
>X #if defined(DEFAULT_SYSCONFDIR)
>X   if (DEFAULT_SYSCONFDIR[0])
>X+  {
>X     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
>X+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
>X+  }
>X #endif /* DEFAULT_SYSCONFDIR */
>X 
>X #endif
>X@@ -1466,7 +1469,7 @@
>X   MY_STAT stat_info;
>X 
>X   if (!my_stat(file_name,&stat_info,MYF(0)))
>X-    return 1;
>X+    return 0;
>X   /*
>X     Ignore .mylogin.cnf file if not exclusively readable/writable
>X     by current user.
>b823232b4a4cdcfcfbd887a5b64c7c88
>echo x - mysql56-client-cluster/files/patch-scripts_CMakeLists.txt
>sed 's/^X//' >mysql56-client-cluster/files/patch-scripts_CMakeLists.txt << '77acec67ee602e5dc335c6da248c6f0f'
>X--- scripts/CMakeLists.txt.orig	2013-01-22 17:54:49.000000000 +0100
>X+++ scripts/CMakeLists.txt	2013-02-13 14:14:11.000000000 +0100
>X@@ -71,6 +71,7 @@
>X )
>X ENDIF()
>X 
>X+IF(FALSE)
>X INSTALL(FILES 
>X   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
>X   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
>X@@ -80,6 +81,7 @@
>X   ${FIX_PRIVILEGES_SQL}
>X   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
>X )
>X+ENDIF()
>X 
>X # TCMalloc hacks
>X IF(MALLOC_LIB)
>X@@ -139,6 +141,7 @@
>X SET(HOSTNAME "hostname")
>X SET(MYSQLD_USER "mysql")
>X 
>X+IF(FALSE)
>X # Required for mysqlbug until autotools are deprecated, once done remove these
>X # and expand default cmake variables
>X SET(CC ${CMAKE_C_COMPILER})
>X@@ -175,6 +178,7 @@
>X   DESTINATION ${INSTALL_BINDIR}
>X   COMPONENT Server
>X   )
>X+ENDIF()
>X 
>X ENDIF(UNIX)
>X 
>X@@ -199,6 +203,7 @@
>X   SET(localstatedir ${MYSQL_DATADIR})
>X ENDIF()
>X 
>X+IF(FALSE)
>X IF(UNIX)
>X   SET(EXT)
>X ELSE()
>X@@ -213,6 +218,7 @@
>X   DESTINATION ${DEST}
>X   COMPONENT Server
>X   )
>X+ENDIF()
>X 
>X 
>X SET(prefix "${CMAKE_INSTALL_PREFIX}")
>X@@ -264,6 +270,8 @@
>X           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
>X           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
>X           SET(${var} "${${var}}-l${lib} " ) 
>X+        ELSEIF(lib STREQUAL "-pthread")
>X+          SET(${var} "${${var}}-pthread " ) 
>X         ELSE()
>X           SET(${var} "${${var}}-l${lib} " ) 
>X         ENDIF()
>X@@ -316,17 +324,9 @@
>X   SET(BIN_SCRIPTS
>X     msql2mysql
>X     mysql_config
>X-    mysql_fix_extensions
>X-    mysql_setpermission
>X-    mysql_zap
>X     mysqlaccess
>X     mysqlaccess.conf
>X-    mysql_convert_table_format
>X     mysql_find_rows
>X-    mysqlhotcopy
>X-    mysqldumpslow
>X-    mysqld_multi
>X-    mysqld_safe
>X   )
>X   FOREACH(file ${BIN_SCRIPTS})
>X     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
>X@@ -350,6 +350,7 @@
>X      )
>X   ENDFOREACH()
>X 
>X+IF(FALSE)
>X   # Input files with pl.in extension - drop the extension completely
>X   SET(PLIN_FILES mysql_secure_installation)
>X   FOREACH(file ${PLIN_FILES})
>X@@ -362,6 +363,7 @@
>X     INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT})
>X   ENDFOREACH()
>X ENDIF()
>X+ENDIF()
>X 
>X # Install libgcc as  mylibgcc.a
>X IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static")
>77acec67ee602e5dc335c6da248c6f0f
>echo x - mysql56-client-cluster/files/patch-support-files_CMakeLists.txt
>sed 's/^X//' >mysql56-client-cluster/files/patch-support-files_CMakeLists.txt << 'a5aba8e963e6f086d5247f5eaac782d5'
>X--- support-files/CMakeLists.txt.orig	2013-01-22 17:54:50.000000000 +0100
>X+++ support-files/CMakeLists.txt	2013-02-13 11:13:32.000000000 +0100
>X@@ -44,14 +44,17 @@
>X   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
>X ENDIF()
>X 
>X+IF(FALSE)
>X SET(inifile my-default)
>X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh 
>X                ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
>X INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
>X         DESTINATION ${inst_location} COMPONENT IniFiles)
>X+ENDIF()
>X 
>X IF(UNIX)
>X   SET(prefix ${CMAKE_INSTALL_PREFIX})
>X+IF(FALSE)
>X   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure)
>X     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
>X                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
>X@@ -68,8 +71,10 @@
>X   IF(INSTALL_SUPPORTFILESDIR)
>X     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
>X   ENDIF()
>X+ENDIF()
>X 
>X   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
>X+IF(FALSE)
>X   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
>X   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
>X   
>X@@ -94,3 +99,4 @@
>X     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
>X     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
>X ENDIF()
>X+ENDIF()
>a5aba8e963e6f086d5247f5eaac782d5
>echo x - mysql56-client-cluster/files/patch-CMakeLists.txt
>sed 's/^X//' >mysql56-client-cluster/files/patch-CMakeLists.txt << '1774a1c4a779830766c51a8569d28dd7'
>X--- CMakeLists.txt.orig	2013-01-22 17:54:49.000000000 +0100
>X+++ CMakeLists.txt	2013-02-13 14:18:37.000000000 +0100
>X@@ -378,31 +378,11 @@
>X ENDIF()
>X 
>X ADD_SUBDIRECTORY(extra)
>X-IF(NOT WITHOUT_SERVER)
>X-  ADD_SUBDIRECTORY(tests)
>X-  ADD_SUBDIRECTORY(client)
>X-  ADD_SUBDIRECTORY(sql)
>X-  ADD_SUBDIRECTORY(sql/share)
>X-  ADD_SUBDIRECTORY(libservices)
>X-  OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
>X-  IF(WITH_EMBEDDED_SERVER) 
>X-   ADD_SUBDIRECTORY(libmysqld)
>X-   ADD_SUBDIRECTORY(libmysqld/examples)
>X-  ENDIF(WITH_EMBEDDED_SERVER)
>X-
>X-  ADD_SUBDIRECTORY(mysql-test)
>X-  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
>X-  ADD_SUBDIRECTORY(support-files)
>X-  ADD_SUBDIRECTORY(scripts)
>X-  ADD_SUBDIRECTORY(sql-bench)
>X-  IF(UNIX)
>X-    ADD_SUBDIRECTORY(man)
>X-  ENDIF()
>X-  IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
>X-    ADD_SUBDIRECTORY(internal)
>X-  ENDIF()
>X-  ADD_SUBDIRECTORY(packaging/rpm-uln)
>X-ENDIF()
>X+ADD_SUBDIRECTORY(client)
>X+ADD_SUBDIRECTORY(libservices)
>X+ADD_SUBDIRECTORY(support-files)
>X+ADD_SUBDIRECTORY(scripts)
>X+ADD_SUBDIRECTORY(man)
>X 
>X INCLUDE(cmake/abi_check.cmake)
>X INCLUDE(cmake/tags.cmake)
>X@@ -439,7 +419,6 @@
>X   SET(CPACK_GENERATOR "TGZ")
>X ENDIF() 
>X ADD_SUBDIRECTORY(packaging/WiX)
>X-ADD_SUBDIRECTORY(packaging/solaris)
>X 
>X # Create a single package with "make package"
>X # (see http://public.kitware.com/Bug/view.php?id=11452)
>X@@ -447,11 +426,11 @@
>X 
>X INCLUDE(CPack)
>X IF(UNIX)
>X-  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
>X ENDIF()
>X #
>X # RPM installs documentation directly from the source tree
>X #
>X+IF(FALSE)
>X IF(NOT INSTALL_LAYOUT MATCHES "RPM")
>X   INSTALL(FILES COPYING LICENSE.mysql 
>X   DESTINATION ${INSTALL_DOCREADMEDIR} 
>X@@ -477,3 +456,4 @@
>X     PATTERN "sp-imp-spec.txt" EXCLUDE
>X   )
>X ENDIF()
>X+ENDIF()
>1774a1c4a779830766c51a8569d28dd7
>echo x - mysql56-client-cluster/files/patch-include_my_compare.h
>sed 's/^X//' >mysql56-client-cluster/files/patch-include_my_compare.h << 'd588da7b14326736de8592751d10d14b'
>X--- include/my_compare.h.orig	2011-05-10 09:46:46.000000000 +0200
>X+++ include/my_compare.h	2011-05-10 09:47:01.000000000 +0200
>X@@ -39,7 +39,7 @@
>X   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
>X */
>X 
>X-#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
>X+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
>X #define HA_MAX_KEY_SEG              16          /* Max segments for key */
>X 
>X #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
>d588da7b14326736de8592751d10d14b
>echo x - mysql56-client-cluster/files/patch-extra_yassl_taocrypt_src_integer.cpp
>sed 's/^X//' >mysql56-client-cluster/files/patch-extra_yassl_taocrypt_src_integer.cpp << '5be045b55a236ea0f9fc152a7b44f897'
>X--- extra/yassl/taocrypt/src/integer.cpp.orig	2012-04-02 09:37:09.000000000 +0200
>X+++ extra/yassl/taocrypt/src/integer.cpp	2012-04-02 09:37:41.000000000 +0200
>X@@ -73,7 +73,7 @@
>X CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
>X                                            size_type n, const void *)
>X {
>X-    if (n > max_size())
>X+    if (n > AlignedAllocator<T>::max_size())
>X         return 0;
>X     if (n == 0)
>X         return 0;
>5be045b55a236ea0f9fc152a7b44f897
>echo x - mysql56-client-cluster/files/patch-cmake_readline.cmake
>sed 's/^X//' >mysql56-client-cluster/files/patch-cmake_readline.cmake << '2ffdc68d7b9d20f3919d031cb80f2164'
>X--- cmake/readline.cmake.orig	2013-02-13 11:49:33.000000000 +0100
>X+++ cmake/readline.cmake	2013-02-13 11:49:56.000000000 +0100
>X@@ -192,7 +192,7 @@
>X     IF(WITH_LIBEDIT) 
>X      MYSQL_USE_BUNDLED_LIBEDIT()
>X     ELSE()
>X-      FIND_SYSTEM_LIBEDIT(edit)
>X+      FIND_SYSTEM_LIBEDIT(readline)
>X       IF(NOT_LIBEDIT_FOUND)
>X         MESSAGE(FATAL_ERROR "Cannot find system libedit libraries.Use WITH_LIBEDIT") 
>X       ENDIF()
>2ffdc68d7b9d20f3919d031cb80f2164
>echo x - mysql56-client-cluster/files/patch-man_CMakeLists.txt
>sed 's/^X//' >mysql56-client-cluster/files/patch-man_CMakeLists.txt << '2e54e11bbba4482ce8905189d43e8df3'
>X--- man/CMakeLists.txt.orig	2011-10-22 14:08:32.000000000 +0200
>X+++ man/CMakeLists.txt	2011-10-22 14:22:42.000000000 +0200
>X@@ -15,10 +15,6 @@
>X 
>X # Copy man pages
>X FILE(GLOB MAN1_FILES *.1)
>X-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
>X-FILE(GLOB MAN1_NDB ndb*.1)
>X-FILE(GLOB MAN8_FILES *.8)
>X-FILE(GLOB MAN8_NDB ndb*.8)
>X IF(MAN1_FILES)
>X   IF(MAN1_EXCLUDE)
>X     LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
>2e54e11bbba4482ce8905189d43e8df3
>echo x - mysql56-client-cluster/files/patch-extra_CMakeLists.txt
>sed 's/^X//' >mysql56-client-cluster/files/patch-extra_CMakeLists.txt << 'a44a96d8f3401a260b1651f767f41ba0'
>X--- extra/CMakeLists.txt.orig	2013-01-22 17:54:50.000000000 +0100
>X+++ extra/CMakeLists.txt	2013-02-13 11:02:40.000000000 +0100
>X@@ -60,6 +60,7 @@
>X ENDIF()
>X 
>X 
>X+IF(FALSE)
>X MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
>X TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
>X SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
>X@@ -96,11 +97,14 @@
>X   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
>X   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
>X ENDIF()
>X+ENDIF()
>X 
>X IF(UNIX)
>X+IF(FALSE)
>X   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
>X   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
>X   SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX)
>X+ENDIF()
>X 
>X   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
>X   TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
>a44a96d8f3401a260b1651f767f41ba0
>exit

Actions: View

Attachments on bug 178125: 133630