FreeBSD Bugzilla – Attachment 164137 Details for
Bug 204607
[NEW PORTS] database/mysql57-{client,server}: Multithreaded SQL database
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
my newer (and maybe final :D) client shar file
mysql57-client.shar (text/plain), 21.00 KB, created by
Mahdi Mokhtari
on 2015-12-11 22:31:19 UTC
(
hide
)
Description:
my newer (and maybe final :D) client shar file
Filename:
MIME Type:
Creator:
Mahdi Mokhtari
Created:
2015-12-11 22:31:19 UTC
Size:
21.00 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: ># ># mysql57-client ># mysql57-client/Makefile ># mysql57-client/pkg-message ># mysql57-client/pkg-plist ># mysql57-client/files ># mysql57-client/files/patch-CMakeLists.txt ># mysql57-client/files/patch-client_CMakeLists.txt ># mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake ># mysql57-client/files/patch-extra_CMakeLists.txt ># mysql57-client/files/patch-include_CMakeLists.txt ># mysql57-client/files/patch-include_my__compare.h ># mysql57-client/files/patch-include_myisam.h ># mysql57-client/files/patch-man_CMakeLists.txt ># mysql57-client/files/patch-mysys__ssl_my__default.cc ># mysql57-client/files/patch-scripts_CMakeLists.txt ># mysql57-client/files/patch-support-files_CMakeLists.txt ># >echo c - mysql57-client >mkdir -p mysql57-client > /dev/null 2>&1 >echo x - mysql57-client/Makefile >sed 's/^X//' >mysql57-client/Makefile << 'bd6f71e4098d89029811ee9e83b6205b' >X# Created by: "Mahdi Mokhtari <mokhi64@gmail.com>" >X# $FreeBSD$ >X >XPORTNAME= mysql >XPKGNAMESUFFIX= 57-client >X >XCOMMENT= Multithreaded SQL database (client) >X >XLICENSE+= LGPL21 >X >XMASTERDIR= ${.CURDIR}/../mysql57-server >X >XPKGMESSAGE= ${.CURDIR}/pkg-message >XPATCHDIR= ${.CURDIR}/files >XPLIST= ${.CURDIR}/pkg-plist >X >XCONFLICTS_INSTALL= mysql5.[0-57-9]-client-* mysql[0-46-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona[0-9][0-9]-client-* >X >XCMAKE_ARGS+= -DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \ >X -DINSTALL_LDCONFIGDIR=${PREFIX}/libdata/ldconfig/ \ >X -DWITHOUT_SERVER=1 \ >X -DWITH_SYSTEMD=0 >X >XUSE_LDCONFIG+= ${PREFIX}/lib/mysql >X >XMMAN1= 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" >bd6f71e4098d89029811ee9e83b6205b >echo x - mysql57-client/pkg-message >sed 's/^X//' >mysql57-client/pkg-message << '410fbdae8baa417316806b3326601fc9' >X* * * * * * * * * * * * * * * * * * * * * * * * >X >XThis is mysql CLIENT (and without server) 5.7.9 >Xfor complete server and client, please install databases/mysql57-server >X >X* * * * * * * * * * * * * * * * * * * * * * * * >410fbdae8baa417316806b3326601fc9 >echo x - mysql57-client/pkg-plist >sed 's/^X//' >mysql57-client/pkg-plist << 'd3738a1f0ee3a9fceef3b095dacef8c0' >Xbin/mysql >Xbin/mysql_config_editor >Xbin/mysql_ssl_rsa_setup >Xbin/mysqladmin >Xbin/mysqlbinlog >Xbin/mysqlcheck >Xbin/mysqldump >Xbin/mysqlimport >Xbin/mysqlpump >Xbin/mysqlshow >Xbin/mysqlslap >Xinclude/mysql/big_endian.h >Xinclude/mysql/byte_order_generic.h >Xinclude/mysql/byte_order_generic_x86.h >Xinclude/mysql/decimal.h >Xinclude/mysql/errmsg.h >Xinclude/mysql/hash.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_byteorder.h >Xinclude/mysql/my_command.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_sys.h >Xinclude/mysql/my_thread.h >Xinclude/mysql/my_thread_local.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/com_data.h >Xinclude/mysql/mysql/get_password.h >Xinclude/mysql/mysql/group_replication_priv.h >Xinclude/mysql/mysql/innodb_priv.h >Xinclude/mysql/mysql/mysql_lex_string.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_group_replication.h >Xinclude/mysql/mysql/plugin_trace.h >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_mdl.h >Xinclude/mysql/mysql/psi/mysql_memory.h >Xinclude/mysql/mysql/psi/mysql_ps.h >Xinclude/mysql/mysql/psi/mysql_socket.h >Xinclude/mysql/mysql/psi/mysql_sp.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/mysql_transaction.h >Xinclude/mysql/mysql/psi/psi.h >Xinclude/mysql/mysql/psi/psi_base.h >Xinclude/mysql/mysql/psi/psi_memory.h >Xinclude/mysql/mysql/service_command.h >Xinclude/mysql/mysql/service_locking.h >Xinclude/mysql/mysql/service_my_plugin_log.h >Xinclude/mysql/mysql/service_my_snprintf.h >Xinclude/mysql/mysql/service_mysql_alloc.h >Xinclude/mysql/mysql/service_mysql_password_policy.h >Xinclude/mysql/mysql/service_mysql_string.h >Xinclude/mysql/mysql/service_parser.h >Xinclude/mysql/mysql/service_rpl_transaction_ctx.h >Xinclude/mysql/mysql/service_rpl_transaction_write_set.h >Xinclude/mysql/mysql/service_rules_table.h >Xinclude/mysql/mysql/service_security_context.h >Xinclude/mysql/mysql/service_srv_session.h >Xinclude/mysql/mysql/service_srv_session_info.h >Xinclude/mysql/mysql/service_thd_alloc.h >Xinclude/mysql/mysql/service_thd_engine_lock.h >Xinclude/mysql/mysql/service_thd_wait.h >Xinclude/mysql/mysql/service_thread_scheduler.h >Xinclude/mysql/mysql/services.h >Xinclude/mysql/mysql/services.h.pp >Xinclude/mysql/mysql/thread_pool_priv.h >Xinclude/mysql/mysql/thread_type.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_group_replication.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/thr_cond.h >Xinclude/mysql/thr_mutex.h >Xinclude/mysql/thr_rwlock.h >Xinclude/mysql/typelib.h >Xlib/mysql/libmysqlclient.a >Xlib/mysql/libmysqlclient.so >Xlib/mysql/libmysqlclient.so.20 >Xlib/mysql/libmysqlservices.a >Xman/man1/comp_err.1.gz >Xman/man1/mysql.1.gz >Xman/man1/mysql_config.1.gz >Xman/man1/mysql_config_editor.1.gz >Xman/man1/mysqladmin.1.gz >Xman/man1/mysqlbinlog.1.gz >Xman/man1/mysqlcheck.1.gz >Xman/man1/mysqldump.1.gz >Xman/man1/mysqlimport.1.gz >Xman/man1/mysqlshow.1.gz >Xman/man1/mysqlslap.1.gz >Xshare/aclocal/mysql.m4 >d3738a1f0ee3a9fceef3b095dacef8c0 >echo c - mysql57-client/files >mkdir -p mysql57-client/files > /dev/null 2>&1 >echo x - mysql57-client/files/patch-CMakeLists.txt >sed 's/^X//' >mysql57-client/files/patch-CMakeLists.txt << '1acd75cf4b3a9b0e6cc05b69a201d807' >X--- CMakeLists.txt.orig 2015-10-12 06:21:33 UTC >X+++ CMakeLists.txt >X@@ -569,8 +569,8 @@ ENDIF() >X >X ADD_SUBDIRECTORY(extra) >X ADD_SUBDIRECTORY(client) >X-ADD_SUBDIRECTORY(sql/share) >X ADD_SUBDIRECTORY(libservices) >X+ADD_SUBDIRECTORY(support-files) >X >X IF(UNIX) >X ADD_SUBDIRECTORY(man) >X@@ -639,14 +639,13 @@ ELSE() >X SET(CPACK_GENERATOR "TGZ") >X ENDIF() >X ADD_SUBDIRECTORY(packaging/WiX) >X-ADD_SUBDIRECTORY(packaging/solaris) >X >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@@ -673,6 +672,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") >X PATTERN "sp-imp-spec.txt" EXCLUDE >X ) >X ENDIF() >X+ENDIF() >X >X INCLUDE(CPack) >X >1acd75cf4b3a9b0e6cc05b69a201d807 >echo x - mysql57-client/files/patch-client_CMakeLists.txt >sed 's/^X//' >mysql57-client/files/patch-client_CMakeLists.txt << '305c6361dc4145ae707ad90bc8181a24' >X--- client/CMakeLists.txt.orig 2015-10-12 06:21:35 UTC >X+++ client/CMakeLists.txt >X@@ -121,6 +121,7 @@ IF(UNIX) >X TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) >X ENDIF(UNIX) >X >X+IF(FALSE) >X IF(NOT WITHOUT_SERVER) >X MYSQL_ADD_EXECUTABLE(mysql_upgrade >X upgrade/program.cc >X@@ -131,10 +132,13 @@ ADD_COMPILE_FLAGS( >X TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core) >X ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema) >X ENDIF() >X+ENDIF() >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 ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) >X TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) >X@@ -152,8 +156,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc >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 ADD_COMPILE_FLAGS( >X@@ -172,8 +178,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli >X MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) >X TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) >X >X+IF(FALSE) >X MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) >X TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) >X+ENDIF() >X >X IF(UNIX AND NOT WITHOUT_SERVER) >X MYSQL_ADD_EXECUTABLE(mysql_install_db >X@@ -196,7 +204,6 @@ IF(WIN32) >X ENDIF(WIN32) >X >X SET_TARGET_PROPERTIES ( >X- mysql_plugin >X mysqlcheck >X mysqldump >X mysqlimport >305c6361dc4145ae707ad90bc8181a24 >echo x - mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake >sed 's/^X//' >mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake << '6936a21aaaa24d359bf17f62e46ed1c3' >X--- cmake/build_configurations/compiler_options.cmake.orig 2015-10-12 06:21:33 UTC >X+++ cmake/build_configurations/compiler_options.cmake >X@@ -28,7 +28,7 @@ IF(UNIX) >X >X # Default GCC flags >X IF(CMAKE_COMPILER_IS_GNUCC) >X- SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") >X+ SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") >X # Disable inline optimizations for valgrind testing to avoid false positives >X IF(WITH_VALGRIND) >X SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") >X@@ -37,7 +37,7 @@ IF(UNIX) >X SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") >X ENDIF() >X IF(CMAKE_COMPILER_IS_GNUCXX) >X- SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") >X+ SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") >X # Disable inline optimizations for valgrind testing to avoid false positives >X IF(WITH_VALGRIND) >X SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}") >6936a21aaaa24d359bf17f62e46ed1c3 >echo x - mysql57-client/files/patch-extra_CMakeLists.txt >sed 's/^X//' >mysql57-client/files/patch-extra_CMakeLists.txt << 'dc5fec5be53de58ff3f3a3c977e7ad5f' >X--- extra/CMakeLists.txt.orig 2015-10-12 06:21:35 UTC >X+++ extra/CMakeLists.txt >X@@ -44,6 +44,7 @@ ENDIF() >X >X ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h >X ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys >X+ COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/ >X COMMAND comp_err >X --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets >X --out-dir=${PROJECT_BINARY_DIR}/sql/share/ >X@@ -72,6 +73,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY >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@@ -132,12 +134,15 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) >X TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl ${LZ4_LIBRARY}) >X ADD_DEPENDENCIES(innochecksum GenError) >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+ENDIF() >X >X # In published release builds on Solaris, we need to bundle gcc source. >X # PB2 will take care of putting it in extra/ when needed >dc5fec5be53de58ff3f3a3c977e7ad5f >echo x - mysql57-client/files/patch-include_CMakeLists.txt >sed 's/^X//' >mysql57-client/files/patch-include_CMakeLists.txt << 'ec43f9fb9baaf529435659262bc47515' >X--- include/CMakeLists.txt.orig 2015-10-12 06:21:33 UTC >X+++ include/CMakeLists.txt >X@@ -37,6 +37,7 @@ SET(HEADERS_ABI >X >X SET(HEADERS >X ${HEADERS_ABI} >X+ hash.h >X my_dbug.h >X m_string.h >X my_sys.h >X@@ -68,7 +69,6 @@ SET(HEADERS >X ${HEADERS_GEN_CONFIGURE} >X ) >X >X-INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR}) >X INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) >X INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development >X PATTERN "*.h" >ec43f9fb9baaf529435659262bc47515 >echo x - mysql57-client/files/patch-include_my__compare.h >sed 's/^X//' >mysql57-client/files/patch-include_my__compare.h << '15a1e925b18414c287f67ad26c6b406e' >X--- include/my_compare.h.orig 2015-10-12 06:21:33 UTC >X+++ include/my_compare.h >X@@ -40,7 +40,7 @@ extern "C" { >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) >15a1e925b18414c287f67ad26c6b406e >echo x - mysql57-client/files/patch-include_myisam.h >sed 's/^X//' >mysql57-client/files/patch-include_myisam.h << '285497d2c0745908b3290b5f255a2145' >X--- include/myisam.h.orig 2015-10-12 06:21:33 UTC >X+++ include/myisam.h >X@@ -45,7 +45,7 @@ extern "C" { >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) >285497d2c0745908b3290b5f255a2145 >echo x - mysql57-client/files/patch-man_CMakeLists.txt >sed 's/^X//' >mysql57-client/files/patch-man_CMakeLists.txt << '99158a141257401e690c4cf2d5815d51' >X--- man/CMakeLists.txt.orig 2015-10-12 06:21:33 UTC >X+++ man/CMakeLists.txt >X@@ -14,11 +14,7 @@ >X # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA >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+FILE(GLOB MAN1_FILES comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1) >X IF(MAN1_FILES) >X IF(MAN1_EXCLUDE) >X LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE}) >99158a141257401e690c4cf2d5815d51 >echo x - mysql57-client/files/patch-mysys__ssl_my__default.cc >sed 's/^X//' >mysql57-client/files/patch-mysys__ssl_my__default.cc << 'f789c997250d2dc2301f811e05dea561' >X--- mysys_ssl/my_default.cc.orig 2015-10-12 06:21:33 UTC >X+++ mysys_ssl/my_default.cc >X@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE; >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@@ -1409,7 +1409,10 @@ static const char **init_default_directo >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@@ -1480,7 +1483,7 @@ int check_file_permissions(const char *f >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. >f789c997250d2dc2301f811e05dea561 >echo x - mysql57-client/files/patch-scripts_CMakeLists.txt >sed 's/^X//' >mysql57-client/files/patch-scripts_CMakeLists.txt << '48f810ac2fab69399cf5528da418afd0' >X--- scripts/CMakeLists.txt.orig 2015-10-12 06:21:33 UTC >X+++ scripts/CMakeLists.txt >X@@ -43,6 +43,7 @@ ELSE() >X MESSAGE(FATAL_ERROR "Cannot concatenate files") >X ENDIF() >X >X+IF(FALSE) >X # Build mysql_fix_privilege_tables.c >X ADD_CUSTOM_COMMAND( >X OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c >X@@ -63,6 +64,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs >X DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c >X ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h >X ) >X+ENDIF() >X >X # If we do not have performance schema compiled in then sys will not work, >X # so only create an empty sys database with an auto-generated file, >X@@ -143,6 +145,7 @@ IF(NOT WITHOUT_SERVER) >X ) >X ENDIF() >X >X+IF(FALSE) >X IF(UNIX) >X FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution >X "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" ) >X@@ -152,6 +155,7 @@ IF(UNIX) >X ENDIF() >X >X IF(NOT WITHOUT_SERVER) >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@@ -282,6 +286,7 @@ SET(HOSTNAME "hostname") >X SET(MYSQLD_USER "mysql") >X >X ENDIF(UNIX) >X+ENDIF() >X >X SET(bindir ${prefix}/${INSTALL_BINDIR}) >X SET(sbindir ${prefix}/${INSTALL_SBINDIR}) >X@@ -347,6 +352,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) >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@@ -433,14 +440,10 @@ ELSE() >X IF(WITH_SYSTEMD) >X SET(BIN_SCRIPTS >X mysql_config >X- mysqldumpslow >X ) >X ELSE() >X SET(BIN_SCRIPTS >X mysql_config >X- mysqldumpslow >X- mysqld_multi >X- mysqld_safe >X ) >X ENDIF() >X >X@@ -510,11 +513,13 @@ ELSE() >X CONFIGURE_FILE(systemd/mysqld.tmpfiles.d.in >X ${CMAKE_CURRENT_BINARY_DIR}/mysql.conf ESCAPE_QUOTES @ONLY) >X >X+IF(FALSE) >X INSTALL_SCRIPT( >X ${CMAKE_CURRENT_BINARY_DIR}/mysqld_pre_systemd >X DESTINATION ${INSTALL_BINDIR} >X COMPONENT Server >X ) >X+ENDIF() >X >X IF(INSTALL_LAYOUT MATCHES "STANDALONE") >X SET(SYSTEMD_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/") >X@@ -532,6 +537,7 @@ ELSE() >X ) >X ENDIF() >X ENDIF() >X+ENDIF() >X >X # Install libgcc as mylibgcc.a >X IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static") >48f810ac2fab69399cf5528da418afd0 >echo x - mysql57-client/files/patch-support-files_CMakeLists.txt >sed 's/^X//' >mysql57-client/files/patch-support-files_CMakeLists.txt << '06f6f8b31290f0a519286ca75c99ac3e' >X--- support-files/CMakeLists.txt.orig 2015-10-12 06:21:35 UTC >X+++ support-files/CMakeLists.txt >X@@ -44,14 +44,17 @@ ELSE() >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) >X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh >X ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) >X@@ -68,8 +71,10 @@ IF(UNIX) >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 >X SET(bindir ${prefix}/${INSTALL_BINDIR}) >X@@ -84,3 +89,4 @@ IF(UNIX) >X PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ >X GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) >X ENDIF() >X+ENDIF() >06f6f8b31290f0a519286ca75c99ac3e >exit >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 204607
:
163206
|
163207
|
163542
|
163543
|
164010
|
164011
|
164136
|
164137
|
164138
|
164236
|
164237
|
164239
|
164311