Attachment 164386 Details for Bug 205433 – svn diff output as patch for mysql-server

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

patch-databases_mysql57-server (text/plain), 3.31 KB, created by Mahdi Mokhtari on 2015-12-19 17:50:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mahdi Mokhtari

Created: 2015-12-19 17:50:41 UTC

Size: 3.31 KB

patch

obsolete

>Index: files/mysql-server.in
>===================================================================
>--- files/mysql-server.in	(.../mysql57-server.orig)	(working copy)
>+++ files/mysql-server.in	(.../mysql57-server)	(working copy)
>@@ -46,7 +46,7 @@
> start_precmd="${name}_prestart"
> start_postcmd="${name}_poststart"
> mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
>-mysql_install_db_args="--basedir=%%PREFIX%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force"
>+mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname}"
> 
> mysql_create_auth_tables()
> {
>Index: files/patch-extra_CMakeLists.txt
>===================================================================
>--- files/patch-extra_CMakeLists.txt	(.../mysql57-server.orig)	(working copy)
>+++ files/patch-extra_CMakeLists.txt	(.../mysql57-server)	(nonexistent)
>@@ -1,31 +0,0 @@
>---- extra/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
>-+++ extra/CMakeLists.txt
>-@@ -73,6 +73,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
>- ENDIF()
>- 
>- 
>-+IF(FALSE)
>- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
>- TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
>- SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
>-@@ -101,6 +102,7 @@ TARGET_LINK_LIBRARIES(lz4_decompress ${L
>- 
>- MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc)
>- TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY})
>-+ENDIF()
>- 
>- IF(WITH_INNOBASE_STORAGE_ENGINE)
>- 
>-@@ -143,10 +145,12 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
>-   ADD_DEPENDENCIES(innochecksum GenError)
>- ENDIF()
>- 
>-+IF(FALSE)
>- IF(UNIX)
>-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
>-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
>- ENDIF()
>-+ENDIF()
>- 
>- # In published release builds on Solaris, we need to bundle gcc source.
>- # PB2 will take care of putting it in extra/ when needed
>
>Property changes on: files/patch-extra_CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-storage_myisam_mi__dynrec.c
>===================================================================
>--- files/patch-storage_myisam_mi__dynrec.c	(.../mysql57-server.orig)	(working copy)
>+++ files/patch-storage_myisam_mi__dynrec.c	(.../mysql57-server)	(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-server.orig)	(working copy)
>+++ pkg-plist	(.../mysql57-server)	(working copy)
>@@ -1,4 +1,6 @@
> bin/innochecksum
>+bin/lz4_decompress
>+bin/my_print_defaults
> bin/myisam_ftdump
> bin/myisamchk
> bin/myisamlog
>@@ -12,6 +14,11 @@
> bin/mysqld_safe
> bin/mysqldumpslow
> bin/mysqltest
>+bin/perror
>+bin/replace
>+bin/resolve_stack_dump
>+bin/resolveip
>+bin/zlib_decompress
> include/mysql/binary_log_types.h
> lib/mysql/libmysqld.a
> lib/mysql/plugin/adt_null.so

Flags:

mmokhi: maintainer-approval+

Actions: View | Diff

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