Attachment 164387 Details for Bug 205433 – svn diff output as patch for mysql-client

[patch] svn diff output as patch for mysql-client

patch-databases_mysql57-client (text/plain), 3.67 KB, created by Mahdi Mokhtari on 2015-12-19 17:51:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mahdi Mokhtari

Created: 2015-12-19 17:51:47 UTC

Size: 3.67 KB

patch

obsolete

>Index: files/patch-scripts_CMakeLists.txt
>===================================================================
>--- files/patch-scripts_CMakeLists.txt	(.../mysql57-client.orig)	(working copy)
>+++ files/patch-scripts_CMakeLists.txt	(.../mysql57-client)	(working copy)
>@@ -24,23 +24,15 @@
>  IF(UNIX)
>   FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution 
>     "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
>-@@ -152,6 +155,7 @@ IF(UNIX)
>+@@ -150,6 +153,7 @@ IF(UNIX)
>+   COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
>+ )
>  ENDIF()
>++ENDIF()
>  
>  IF(NOT WITHOUT_SERVER)
>-+IF(FALSE)
>    INSTALL(FILES
>-     ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
>-     ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
>-@@ -282,6 +286,7 @@ SET(HOSTNAME "hostname")
>- SET(MYSQLD_USER "mysql")
>- 
>- ENDIF(UNIX)
>-+ENDIF()
>- 
>- SET(bindir ${prefix}/${INSTALL_BINDIR})
>- SET(sbindir ${prefix}/${INSTALL_SBINDIR})
>-@@ -347,6 +352,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
>+@@ -347,6 +351,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
>            GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
>            STRING(REGEX REPLACE "^lib" "" lib "${lib}")
>            SET(${var} "${${var}}-l${lib} " ) 
>@@ -49,40 +41,24 @@
>          ELSE()
>            SET(${var} "${${var}}-l${lib} " ) 
>          ENDIF()
>-@@ -433,14 +440,10 @@ ELSE()
>-   IF(WITH_SYSTEMD)
>-     SET(BIN_SCRIPTS
>-       mysql_config
>+@@ -430,19 +436,7 @@ ELSE()
>+   # On Unix, most of the files end up in the bin directory
>+   SET(mysql_config_COMPONENT COMPONENT Development)
>+ 
>+-  IF(WITH_SYSTEMD)
>+-    SET(BIN_SCRIPTS
>+-      mysql_config
> -      mysqldumpslow
>-       )
>-   ELSE()
>-     SET(BIN_SCRIPTS
>-       mysql_config
>+-      )
>+-  ELSE()
>+-    SET(BIN_SCRIPTS
>+-      mysql_config
> -      mysqldumpslow
> -      mysqld_multi
> -      mysqld_safe
>-       )
>-   ENDIF()
>+-      )
>+-  ENDIF()
>++  SET(BIN_SCRIPTS mysql_config)
>  
>-@@ -510,11 +513,13 @@ ELSE()
>-     CONFIGURE_FILE(systemd/mysqld.tmpfiles.d.in
>-       ${CMAKE_CURRENT_BINARY_DIR}/mysql.conf ESCAPE_QUOTES @ONLY)
>- 
>-+IF(FALSE)
>-     INSTALL_SCRIPT(
>-       ${CMAKE_CURRENT_BINARY_DIR}/mysqld_pre_systemd
>-       DESTINATION ${INSTALL_BINDIR}
>-       COMPONENT Server
>-     )
>-+ENDIF()
>- 
>-     IF(INSTALL_LAYOUT MATCHES "STANDALONE")
>-       SET(SYSTEMD_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
>-@@ -532,6 +537,7 @@ ELSE()
>-     )
>-   ENDIF()
>- ENDIF()
>-+ENDIF()
>- 
>- # Install libgcc as  mylibgcc.a
>- IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static")
>+   SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
>+   STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
>Index: files/patch-storage_myisam_mi__dynrec.c
>===================================================================
>--- files/patch-storage_myisam_mi__dynrec.c	(.../mysql57-client.orig)	(working copy)
>+++ files/patch-storage_myisam_mi__dynrec.c	(.../mysql57-client)	(working copy)
>@@ -1,4 +1,4 @@
>---- storage/myisam/mi_dynrec.c.orig	2015-12-14 07:39:39 UTC
>+--- storage/myisam/mi_dynrec.c.orig	2015-11-29 19:16:24 UTC
> +++ storage/myisam/mi_dynrec.c
> @@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
>      DBUG_RETURN(1);
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(.../mysql57-client.orig)	(working copy)
>+++ pkg-plist	(.../mysql57-client)	(working copy)
>@@ -1,4 +1,5 @@
> bin/mysql
>+bin/mysql_config
> bin/mysql_config_editor
> bin/mysql_ssl_rsa_setup
> bin/mysqladmin
>@@ -115,6 +116,7 @@
> lib/mysql/libmysqlclient.so
> lib/mysql/libmysqlclient.so.20
> lib/mysql/libmysqlservices.a
>+libdata/pkgconfig/mysqlclient.pc
> man/man1/comp_err.1.gz
> man/man1/mysql.1.gz
> man/man1/mysql_config.1.gz

Flags:

mmokhi: maintainer-approval+

Actions: View | Diff

Attachments on bug 205433: 164386 | 164387 | 164546 | 164547