diff --git a/.gitignore b/.gitignore index f7a79f8..2f9cc94 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mysql-5.5.45.tar.gz +SOURCES/mysql-5.5.50.tar.gz diff --git a/.mysql55-mysql.metadata b/.mysql55-mysql.metadata index 752c6d3..93a4a03 100644 --- a/.mysql55-mysql.metadata +++ b/.mysql55-mysql.metadata @@ -1 +1 @@ -225f7979d37c5877696c89195acc8e70df03d702 SOURCES/mysql-5.5.45.tar.gz +08b27227d66b39b7914c6b5a0e16012dd57048a9 SOURCES/mysql-5.5.50.tar.gz diff --git a/SOURCES/mysql-chain-certs.patch b/SOURCES/mysql-chain-certs.patch index 164c22e..8fda6f4 100644 --- a/SOURCES/mysql-chain-certs.patch +++ b/SOURCES/mysql-chain-certs.patch @@ -13,7 +13,7 @@ See RH bug #598656. Filed upstream at http://bugs.mysql.com/bug.php?id=54158 diff -Naur mysql-5.5.28.orig/extra/yassl/src/ssl.cpp mysql-5.5.28/extra/yassl/src/ssl.cpp --- mysql-5.5.28.orig/extra/yassl/src/ssl.cpp 2012-08-29 04:50:46.000000000 -0400 +++ mysql-5.5.28/extra/yassl/src/ssl.cpp 2012-09-29 12:45:19.682287214 -0400 -@@ -1627,10 +1627,10 @@ +@@ -1654,10 +1654,10 @@ } @@ -30,7 +30,7 @@ diff -Naur mysql-5.5.28.orig/extra/yassl/src/ssl.cpp mysql-5.5.28/extra/yassl/sr diff -Naur mysql-5.5.28.orig/vio/viosslfactories.c mysql-5.5.28/vio/viosslfactories.c --- mysql-5.5.28.orig/vio/viosslfactories.c 2012-08-29 04:50:46.000000000 -0400 +++ mysql-5.5.28/vio/viosslfactories.c 2012-09-29 12:46:35.124975585 -0400 -@@ -106,7 +106,7 @@ +@@ -136,7 +136,7 @@ key_file= cert_file; if (cert_file && diff --git a/SOURCES/mysql-cipherspec.patch b/SOURCES/mysql-cipherspec.patch index 18b8fee..b3442bd 100644 --- a/SOURCES/mysql-cipherspec.patch +++ b/SOURCES/mysql-cipherspec.patch @@ -7,7 +7,7 @@ Upstream bug report: http://bugs.mysql.com/bug.php?id=64461 diff -Naur mysql-5.5.27.orig/client/mysqltest.cc mysql-5.5.27/client/mysqltest.cc --- mysql-5.5.27.orig/client/mysqltest.cc 2012-07-20 13:38:02.000000000 -0400 +++ mysql-5.5.27/client/mysqltest.cc 2012-08-05 01:01:21.502130550 -0400 -@@ -5458,6 +5458,7 @@ +@@ -5466,6 +5466,7 @@ my_bool con_ssl= 0, con_compress= 0; my_bool con_pipe= 0, con_shm= 0, con_cleartext_enable= 0; struct st_connection* con_slot; @@ -15,7 +15,7 @@ diff -Naur mysql-5.5.27.orig/client/mysqltest.cc mysql-5.5.27/client/mysqltest.c static DYNAMIC_STRING ds_connection_name; static DYNAMIC_STRING ds_host; -@@ -5548,6 +5549,8 @@ +@@ -5556,6 +5557,8 @@ con_shm= 1; else if (!strncmp(con_options, "CLEARTEXT", 9)) con_cleartext_enable= 1; @@ -24,7 +24,7 @@ diff -Naur mysql-5.5.27.orig/client/mysqltest.cc mysql-5.5.27/client/mysqltest.c else die("Illegal option to connect: %.*s", (int) (end - con_options), con_options); -@@ -5595,8 +5598,11 @@ +@@ -5603,8 +5606,11 @@ if (con_ssl) { #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) @@ -59,7 +59,7 @@ diff -Naur mysql-5.5.27.orig/mysql-test/t/openssl_1.test mysql-5.5.27/mysql-test connection con1; # Check ssl turned on -@@ -119,7 +119,7 @@ +@@ -125,7 +125,7 @@ # verification of servers certificate by setting both ca certificate # and ca path to NULL # @@ -68,7 +68,7 @@ diff -Naur mysql-5.5.27.orig/mysql-test/t/openssl_1.test mysql-5.5.27/mysql-test --echo End of 5.0 tests # -@@ -244,7 +244,7 @@ +@@ -250,7 +250,7 @@ GRANT SELECT ON test.* TO bug42158@localhost REQUIRE X509; FLUSH PRIVILEGES; diff --git a/SOURCES/mysql-covscan-stroverflow.patch b/SOURCES/mysql-covscan-stroverflow.patch index d671b45..8e04d74 100644 --- a/SOURCES/mysql-covscan-stroverflow.patch +++ b/SOURCES/mysql-covscan-stroverflow.patch @@ -9,7 +9,7 @@ mysql-5.5.31/plugin/semisync/semisync_master.cc:555:parameter_as_source – Note diff -up mysql-5.5.31/plugin/semisync/semisync_master.cc.covscan-stroverflow mysql-5.5.31/plugin/semisync/semisync_master.cc --- mysql-5.5.31/plugin/semisync/semisync_master.cc.covscan-stroverflow 2013-06-17 09:04:47.214621154 +0200 +++ mysql-5.5.31/plugin/semisync/semisync_master.cc 2013-06-17 09:08:32.189617218 +0200 -@@ -552,7 +552,8 @@ int ReplSemiSyncMaster::reportReplyBinlo +@@ -555,7 +555,8 @@ int ReplSemiSyncMaster::reportReplyBinlo if (need_copy_send_pos) { @@ -19,7 +19,7 @@ diff -up mysql-5.5.31/plugin/semisync/semisync_master.cc.covscan-stroverflow mys reply_file_pos_ = log_file_pos; reply_file_name_inited_ = true; -@@ -658,7 +659,8 @@ int ReplSemiSyncMaster::commitTrx(const +@@ -661,7 +662,8 @@ int ReplSemiSyncMaster::commitTrx(const if (cmp <= 0) { /* This thd has a lower position, let's update the minimum info. */ @@ -29,7 +29,7 @@ diff -up mysql-5.5.31/plugin/semisync/semisync_master.cc.covscan-stroverflow mys wait_file_pos_ = trx_wait_binlog_pos; rpl_semi_sync_master_wait_pos_backtraverse++; -@@ -669,7 +671,8 @@ int ReplSemiSyncMaster::commitTrx(const +@@ -672,7 +674,8 @@ int ReplSemiSyncMaster::commitTrx(const } else { diff --git a/SOURCES/mysql-dubious-exports.patch b/SOURCES/mysql-dubious-exports.patch index 0ccb412..7bccf9d 100644 --- a/SOURCES/mysql-dubious-exports.patch +++ b/SOURCES/mysql-dubious-exports.patch @@ -12,7 +12,7 @@ by mysql.h, but these two are relatively easy to get rid of. diff -Naur mysql-5.5.14.orig/client/mysqladmin.cc mysql-5.5.14/client/mysqladmin.cc --- mysql-5.5.14.orig/client/mysqladmin.cc 2011-06-21 12:42:41.000000000 -0400 +++ mysql-5.5.14/client/mysqladmin.cc 2011-07-12 12:19:59.578066771 -0400 -@@ -20,6 +20,7 @@ +@@ -21,6 +21,7 @@ #include /* because of signal() */ #include #include @@ -20,7 +20,7 @@ diff -Naur mysql-5.5.14.orig/client/mysqladmin.cc mysql-5.5.14/client/mysqladmin #include #include /* ORACLE_WELCOME_COPYRIGHT_NOTICE */ -@@ -975,9 +976,9 @@ +@@ -1003,9 +1004,9 @@ } } if (old) @@ -46,7 +46,7 @@ diff -Naur mysql-5.5.14.orig/include/errmsg.h mysql-5.5.14/include/errmsg.h diff -Naur mysql-5.5.14.orig/include/my_sys.h mysql-5.5.14/include/my_sys.h --- mysql-5.5.14.orig/include/my_sys.h 2011-06-21 12:42:39.000000000 -0400 +++ mysql-5.5.14/include/my_sys.h 2011-07-12 11:55:29.195231427 -0400 -@@ -223,6 +223,7 @@ +@@ -219,6 +219,7 @@ /* charsets */ #define MY_ALL_CHARSETS_SIZE 2048 @@ -54,7 +54,7 @@ diff -Naur mysql-5.5.14.orig/include/my_sys.h mysql-5.5.14/include/my_sys.h extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *default_charset_info; extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *all_charsets[MY_ALL_CHARSETS_SIZE]; extern CHARSET_INFO compiled_charsets[]; -@@ -900,6 +901,9 @@ +@@ -898,6 +899,9 @@ extern uint get_collation_number(const char *name); extern const char *get_charset_name(uint cs_number); @@ -119,7 +119,7 @@ diff -Naur mysql-5.5.14.orig/include/mysql_com.h mysql-5.5.14/include/mysql_com. diff -Naur mysql-5.5.14.orig/sql/password.c mysql-5.5.14/sql/password.c --- mysql-5.5.14.orig/sql/password.c 2011-06-21 12:42:40.000000000 -0400 +++ mysql-5.5.14/sql/password.c 2011-07-12 11:59:29.194068612 -0400 -@@ -154,23 +154,6 @@ +@@ -155,23 +155,6 @@ /* @@ -143,7 +143,7 @@ diff -Naur mysql-5.5.14.orig/sql/password.c mysql-5.5.14/sql/password.c Scramble string with password. Used in pre 4.1 authentication phase. SYNOPSIS -@@ -433,23 +416,6 @@ +@@ -434,23 +417,6 @@ /* diff --git a/SOURCES/mysql-errno.patch b/SOURCES/mysql-errno.patch index 93e61de..3d7744a 100644 --- a/SOURCES/mysql-errno.patch +++ b/SOURCES/mysql-errno.patch @@ -4,7 +4,7 @@ diff -Naur mysql-5.5.8.orig/include/my_sys.h mysql-5.5.8/include/my_sys.h --- mysql-5.5.8.orig/include/my_sys.h 2010-12-03 12:58:24.000000000 -0500 +++ mysql-5.5.8/include/my_sys.h 2010-12-20 21:20:12.622190325 -0500 -@@ -201,13 +201,8 @@ +@@ -197,13 +197,8 @@ #define my_afree(PTR) my_free(PTR) #endif /* HAVE_ALLOCA */ diff --git a/SOURCES/mysql-man-pages.patch b/SOURCES/mysql-man-pages.patch deleted file mode 100644 index 7e5edec..0000000 --- a/SOURCES/mysql-man-pages.patch +++ /dev/null @@ -1,976 +0,0 @@ -diff -rup mysql-5.5.40-orig/man/mysql.1 mysql-5.5.40/man/mysql.1 ---- mysql-5.5.40-orig/man/mysql.1 2014-11-06 16:05:04.548331222 +0100 -+++ mysql-5.5.40/man/mysql.1 2014-11-06 16:12:44.224488098 +0100 -@@ -135,7 +135,8 @@ Section\ \&4.2.6, \(lqUsing Option Files - .\" mysql: help option - .\" help option: mysql - \fB\-\-help\fR, --\fB\-?\fR -+\fB\-?\fR, -+\fB\-I\fR - .sp - Display a help message and exit\&. - .RE -@@ -332,6 +333,21 @@ Compress all information sent between th - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysql: connect-timeout option -+.\" connect-timeout option: mysql -+\fB\-\-connect\-timeout=\fR\fB\fIseconds\fR\fR -+.sp -+Set the time for connection timeout in seconds\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysql: database option - .\" database option: mysql - \fB\-\-database=\fR\fB\fIdb_name\fR\fR, -@@ -509,6 +525,37 @@ groups\&. - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysql: defaults-file option -+.\" defaults-file option: mysql -+\fB\-\-defaults-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&. Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysql: defaults-extra-file option -+.\" defaults-extra-file option: mysql -+\fB\-\-defaults-extra-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been read\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysql: delimiter option - .\" delimiter option: mysql - \fB\-\-delimiter=\fR\fB\fIstr\fR\fR -@@ -708,6 +755,36 @@ has no effect if the server does not als - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysql: max-allowed-packet option -+.\" max-allowed-packet option: mysql -+\fB\-\-max\-allowed\-packet=\fR\fB\fInum\fR\fR -+.sp -+Specify the maximum packet length to send to or recieve form server\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysql: max-join-size option -+.\" max-join-size option: mysql -+\fB\-\-max\-join\-size=\fR\fB\fInum\fR\fR -+.sp -+Set the automatic limit for rows in a join when using \fB\-\-safe\-updates\fR\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysql: named-commands option - .\" named-commands option: mysql - \fB\-\-named\-commands\fR, -@@ -733,6 +810,21 @@ the section called \(lqMYSQL COMMANDS\(r - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysql: net-buffer-length option -+.\" net-buffer-length option: mysql -+\fB\-\-net\-buffer\-lenght=\fR\fB\fIsize\fR\fR -+.sp -+Set the buffer size for TCP/IP and socket communication\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysql: no-auto-rehash option - .\" no-auto-rehash option: mysql - \fB\-\-no\-auto\-rehash\fR, -@@ -784,6 +876,21 @@ can be used to prevent them from being r - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysql: no-defaults option -+.\" no-defaults option: mysql -+\fB\-\-no\-defaults\fR -+.sp -+Do not read default options from any option file\&. This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysql: no-named-commands option - .\" no-named-commands option: mysql - \fB\-\-no\-named\-commands\fR, -@@ -1069,6 +1176,21 @@ Print the program name and all options t - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysql: print-defaults option -+.\" print-defaults option: mysql -+\fB\-\-print\-defaults\fR -+.sp -+Print the program argument list and exit\&. This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysql: prompt option - .\" prompt option: mysql - \fB\-\-prompt=\fR\fB\fIformat_str\fR\fR -@@ -1267,6 +1389,36 @@ option to enable shared\-memory connecti - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysql: select-limit option -+.\" select-limit option: mysql -+\fB\-\-select\-limit=\fR\fB\fIlimit\fR\fR -+.sp -+Set automatic limit for SELECT when using \fB\-\-safe\-updates\fR\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysql: server-arg option -+.\" server-arg option: mysql -+\fB\-\-server\-arg=\fR\fB\fIname\fR\fR -+.sp -+Send \fB\fIname\fR\fR as a parameter to the embedded server\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysql: show-warnings option - .\" show-warnings option: mysql - \fB\-\-show\-warnings\fR -@@ -1320,6 +1472,21 @@ option\&. - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysql: skip-auto-rehash option -+.\" skip-auto-rehash option: mysql -+\fB\-\-skip\-auto\-rehash\fR -+.sp -+Disable automatic rehashing\&. Synonym for \fB\-\-disable\-auto\-rehash\fR\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysql: skip-column-names option - .\" skip-column-names option: mysql - \fB\-\-skip\-column\-names\fR, -@@ -1374,7 +1541,7 @@ localhost, the Unix socket file to use, - \fB\-\-ssl*\fR - .sp - Options that begin with --\fB\-\-ssl\fR -+\fB\-\-ssl\fR, - specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See - Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&. - .RE -@@ -1550,7 +1717,7 @@ The XML output also uses an XML namespac - .RS 4 - .\} - .nf --shell> \fBmysql \-\-xml \-uroot \-e "SHOW VARIABLES LIKE \*(Aqversion%\*(Aq"\fR -+shell> \fBmysql \-\-xml \-u root \-e "SHOW VARIABLES LIKE \*(Aqversion%\*(Aq"\fR - - - -@@ -3297,16 +3464,16 @@ statements that probably need to examine - .RE - .PP - To specify limits different from 1,000 and 1,000,000, you can override the defaults by using the --\fB\-\-select_limit\fR -+\fB\-\-select\-limit\fR - and --\fB\-\-max_join_size\fR -+\fB\-\-max\-join\-size\fR - options: - .sp - .if n \{\ - .RS 4 - .\} - .nf --shell> \fBmysql \-\-safe\-updates \-\-select_limit=500 \-\-max_join_size=10000\fR -+shell> \fBmysql \-\-safe\-updates \-\-select\-limit=500 \-\-max\-join\-size=10000\fR - .fi - .if n \{\ - .RE -diff -rup mysql-5.5.40-orig/man/mysqladmin.1 mysql-5.5.40/man/mysqladmin.1 ---- mysql-5.5.40-orig/man/mysqladmin.1 2014-11-06 16:05:04.549331220 +0100 -+++ mysql-5.5.40/man/mysqladmin.1 2014-11-06 16:06:51.020132682 +0100 -@@ -687,6 +687,21 @@ Compress all information sent between th - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqladmin: connect-timeout option -+.\" connect-timeout option: mysqladmin -+\fB\-\-connect-timeout=\fR\fB\fItimeout\fR\fR -+.sp -+Equivalent to \fB\-\-connect_timeout\fR, see the end of this section\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqladmin: count option - .\" count option: mysqladmin - \fB\-\-count=\fR\fB\fIN\fR\fR, -@@ -855,6 +870,37 @@ groups\&. - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqladmin: defaults-extra-file option -+.\" defaults-extra-file option: mysqladmin -+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been read\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqladmin: defaults-file option -+.\" defaults-file option: mysqladmin -+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&. Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqladmin: enable-cleartext-plugin option - .\" enable-cleartext-plugin option: mysqladmin - \fB\-\-enable\-cleartext\-plugin\fR -@@ -940,6 +986,21 @@ can be used to prevent them from being r - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqladmin: no-defaults option -+.\" no-defaults option: mysqladmin -+\fB\-\-no\-defaults\fR -+.sp -+Do not read default options from any option file\&. This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqladmin: password option - .\" password option: mysqladmin - \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR, -@@ -1038,6 +1099,21 @@ Print the program name and all options t - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqladmin: print-defaults option -+.\" print-defaults option: mysqladmin -+\fB\-\-print\-defaults\fR -+.sp -+Print the program argument list and exit\&. This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqladmin: protocol option - .\" protocol option: mysqladmin - \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR -@@ -1067,6 +1143,21 @@ command\&. - .RE - .sp - .RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqladmin: shutdown-timeout option -+.\" shutdown-timeout option: mysqladmin -+\fB\-\-shutdown\-timeout\fR\fB\fItimeout\fR\fR -+.sp -+Equivalent of \fB\-\-shutdown_timeout\fR, see the end of this section\&. -+.RE -+.sp -+.RS 4 - .ie n \{\ - \h'-04'\(bu\h'+03'\c - .\} -diff -rup mysql-5.5.40-orig/man/mysqlbinlog.1 mysql-5.5.40/man/mysqlbinlog.1 ---- mysql-5.5.40-orig/man/mysqlbinlog.1 2014-11-06 16:05:04.547331224 +0100 -+++ mysql-5.5.40/man/mysqlbinlog.1 2014-11-06 16:06:51.020132682 +0100 -@@ -677,6 +677,7 @@ privilege\&. - \fB\-F\fR - .sp - Read binary log files even if they are open or were not closed properly\&. -+Enabled by default, use \fB\-\-skip\-force\-if\-open\fR to disable\&. - .RE - .sp - .RS 4 -@@ -785,6 +786,22 @@ can be used to prevent them from being r - .RE - .sp - .RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqlbinlog: open-files-limit option -+.\" open-files-limit option: mysqlbinlog -+\fB\-\-open\-files\-limit=\fR\fB\fINUM\fR\fR -+.sp -+Sets the open_files_limit variable, which is used to reserve file descriptors for -+\fBmysqlbinlog\fR\&. -+.RE -+.sp -+.RS 4 - .ie n \{\ - \h'-04'\(bu\h'+03'\c - .\} -diff -rup mysql-5.5.40-orig/man/mysqlcheck.1 mysql-5.5.40/man/mysqlcheck.1 ---- mysql-5.5.40-orig/man/mysqlcheck.1 2014-11-06 16:05:04.549331220 +0100 -+++ mysql-5.5.40/man/mysqlcheck.1 2014-11-06 16:06:51.021132680 +0100 -@@ -568,6 +568,38 @@ groups\&. - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqlcheck: defaults-extra-file option -+.\" defaults-extra-file option: mysqlcheck -+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been read\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqlcheck: defaults-file option -+.\" defaults-file option: mysqlcheck -+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqlcheck: extended option - .\" extended option: mysqlcheck - \fB\-\-extended\fR, -@@ -717,6 +749,21 @@ can be used to prevent them from being r - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqlcheck: no-defaults option -+.\" no-defaults option: mysqlcheck -+\fB\-\-no\-defaults\fR -+.sp -+Do not read default options from any option file\&. This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqlcheck: optimize option - .\" optimize option: mysqlcheck - \fB\-\-optimize\fR, -@@ -809,6 +856,22 @@ The TCP/IP port number to use for the co - .RE - .sp - .RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqlcheck: print-defaults option -+.\" print-defaults option: mysqlcheck -+\fB\-\-print\-defaults\fR -+.sp -+Print the program argument list and exit\&. -+This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 - .ie n \{\ - \h'-04'\(bu\h'+03'\c - .\} -diff -rup mysql-5.5.40-orig/man/mysql_config.1 mysql-5.5.40/man/mysql_config.1 ---- mysql-5.5.40-orig/man/mysql_config.1 2014-11-06 16:05:04.547331224 +0100 -+++ mysql-5.5.40/man/mysql_config.1 2014-11-06 16:06:51.021132680 +0100 -@@ -178,6 +178,22 @@ The default Unix socket file, defined wh - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysql_config: variable option -+.\" variable option: mysql_config -+\fB\-\-variable=VAR\fR -+.sp -+Path to MySQL include, library and plugin directories\&. \fBVAR\fR is one of -+`pkgincludedir`, `pkglibdir` and `plugindir`, respectively\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysql_config: version option - .\" version option: mysql_config - \fB\-\-version\fR -diff -rup mysql-5.5.40-orig/man/mysqldump.1 mysql-5.5.40/man/mysqldump.1 ---- mysql-5.5.40-orig/man/mysqldump.1 2014-11-06 16:05:04.546331226 +0100 -+++ mysql-5.5.40/man/mysqldump.1 2014-11-06 16:06:51.024132675 +0100 -@@ -689,7 +689,8 @@ Compress all information sent between th - .\} - .\" mysqldump: create-options option - .\" create-options option: mysqldump --\fB\-\-create\-options\fR -+\fB\-\-create\-options\fR, -+\fB\-a\fR - .sp - Include all MySQL\-specific table options in the - CREATE TABLE -@@ -880,6 +881,38 @@ groups\&. - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqldump: defaults-extra-file option -+.\" defaults-extra-file option: mysqldump -+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been read\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqldump: defaults-file option -+.\" defaults-file option: mysqldump -+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqldump: delayed-insert option - .\" delayed-insert option: mysqldump - \fB\-\-delayed\-insert\fR -@@ -1557,6 +1590,36 @@ to point the slave to the correct master - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqldump: max-allowed-packet option -+.\" max-allowed-packet option: mysqldump -+\fB\-\-max\-allowed\-packet=\fR\fB\fIlength\fR\fR -+.sp -+Sets the maximum packet length to send to or recieve from server\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqldump: net-buffer-length option -+.\" net-buffer-length option: mysqldump -+\fB\-\-net\-buffer\-length=\fR\fB\fIlength\fR\fR -+.sp -+Sets the buffer size for TCP/IP and socket communication\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqldump: no-autocommit option - .\" no-autocommit option: mysqldump - \fB\-\-no\-autocommit\fR -@@ -1674,6 +1737,21 @@ can be used to prevent them from being r - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqldump: no-defaults option -+.\" no-defaults option: mysqldump -+\fB\-\-no\-defaults\fR -+.sp -+Do not read default options from any option file\&. This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqldump: no-set-names option - .\" no-set-names option: mysqldump - \fB\-\-no\-set\-names\fR, -@@ -1834,6 +1912,21 @@ The TCP/IP port number to use for the co - .RE - .sp - .RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqldump: print-defaults option -+.\" print-defaults option: mysqldump -+\fB\-\-print\-defaults\fR -+.sp -+Print the program argument list and exit\&. This must begiven as the first argument\&. -+.RE -+.sp -+.RS 4 - .ie n \{\ - \h'-04'\(bu\h'+03'\c - .\} -diff -rup mysql-5.5.40-orig/man/mysqlimport.1 mysql-5.5.40/man/mysqlimport.1 ---- mysql-5.5.40-orig/man/mysqlimport.1 2014-11-06 16:05:04.548331222 +0100 -+++ mysql-5.5.40/man/mysqlimport.1 2014-11-06 16:06:51.024132675 +0100 -@@ -322,10 +322,42 @@ groups\&. - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqlimport: defaults-extra-file option -+.\" defaults-extra-file option: mysqlimport -+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been -+read\&. Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqlimport: defaults-file option -+.\" defaults-file option: mysqlimport -+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqlimport: delete option - .\" delete option: mysqlimport - \fB\-\-delete\fR, --\fB\-D\fR -+\fB\-d\fR - .sp - Empty the table before importing the text file\&. - .RE -@@ -524,6 +556,22 @@ can be used to prevent them from being r - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqlimport: no-defaults option -+.\" no-defaults option: mysqlimport -+\fB\-\-no\-defaults\fR -+.sp -+Do not read default options from any option file\&. This must be given as the -+first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqlimport: password option - .\" password option: mysqlimport - \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR, -@@ -600,6 +648,22 @@ The TCP/IP port number to use for the co - .RE - .sp - .RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqlimport: print-defaults option -+.\" print-defaults option: mysqlimport -+\fB\-\-print\-defaults\fR -+.sp -+Print the program argument list and exit\&. -+This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 - .ie n \{\ - \h'-04'\(bu\h'+03'\c - .\} -diff -rup mysql-5.5.40-orig/man/mysqlshow.1 mysql-5.5.40/man/mysqlshow.1 ---- mysql-5.5.40-orig/man/mysqlshow.1 2014-11-06 16:05:04.547331224 +0100 -+++ mysql-5.5.40/man/mysqlshow.1 2014-11-06 16:06:51.025132673 +0100 -@@ -173,7 +173,8 @@ that is supplied with MySQL Cluster\&. I - .\} - .\" mysqlshow: character-sets-dir option - .\" character-sets-dir option: mysqlshow --\fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR -+\fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR, -+\fB\-c\fR - .sp - The directory where character sets are installed\&. See - Section\ \&10.5, \(lqCharacter Set Configuration\(rq\&. -@@ -369,6 +370,38 @@ groups\&. - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqlshow: defaults-extra-file option -+.\" defaults-extra-file option: mysqlshow -+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been -+read\&. Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqlshow: defaults-file option -+.\" defaults-file option: mysqlshow -+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqlshow: host option - .\" host option: mysqlshow - \fB\-\-host=\fR\fB\fIhost_name\fR\fR, -@@ -418,6 +451,22 @@ can be used to prevent them from being r - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqlshow: no-defaults option -+.\" no-defaults option: mysqlshow -+\fB\-\-no\-defaults\fR -+.sp -+Do not read default options from any option file\&. This must be given as the -+first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqlshow: password option - .\" password option: mysqlshow - \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR, -@@ -494,6 +543,22 @@ The TCP/IP port number to use for the co - .RE - .sp - .RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqlshow: print-defaults option -+.\" print-defaults option: mysqlshow -+\fB\-\-print\-defaults\fR -+.sp -+Print the program argument list and exit\&. -+This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 - .ie n \{\ - \h'-04'\(bu\h'+03'\c - .\} -diff -rup mysql-5.5.40-orig/man/mysqlslap.1 mysql-5.5.40/man/mysqlslap.1 ---- mysql-5.5.40-orig/man/mysqlslap.1 2014-11-06 16:05:04.548331222 +0100 -+++ mysql-5.5.40/man/mysqlslap.1 2014-11-06 16:06:51.025132673 +0100 -@@ -588,6 +588,38 @@ groups\&. - .el \{\ - .sp -1 - .IP \(bu 2.3 -+.\" mysqlslap: defaults-extra-file option -+.\" defaults-extra-file option: mysqlslap -+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been -+read\&. Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqlslap: defaults-file option -+.\" defaults-file option: mysqlslap -+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\} - .\" mysqlslap: delimiter option - .\" delimiter option: mysqlslap -@@ -722,6 +754,37 @@ can be used to prevent them from being r - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqlslap: no-defaults option -+.\" no-defaults option: mysqlslap -+\fB\-\-no\-defaults\fR -+.sp -+Do not read default options from any option file\&. This must be given as the -+first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqlslap: no-drop option -+.\" no-drop option: mysqlslap -+\fB\-\-no\-drop\fR -+.sp -+Do not drop the schema after the test\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqlslap: number-char-cols option - .\" number-char-cols option: mysqlslap - \fB\-\-number\-char\-cols=\fR\fB\fIN\fR\fR, -@@ -900,6 +963,22 @@ The file or string containing the statem - .RE - .sp - .RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqlslap: print-defaults option -+.\" print-defaults option: mysqlslap -+\fB\-\-print\-defaults\fR -+.sp -+Print the program argument list and exit\&. -+This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 - .ie n \{\ - \h'-04'\(bu\h'+03'\c - .\} diff --git a/SOURCES/mysql-plugin-bool.patch b/SOURCES/mysql-plugin-bool.patch index a8458f4..376748a 100644 --- a/SOURCES/mysql-plugin-bool.patch +++ b/SOURCES/mysql-plugin-bool.patch @@ -7,7 +7,7 @@ http://bugs.mysql.com/bug.php?id=59905 diff -Naur mysql-5.5.8.orig/sql/sql_plugin.cc mysql-5.5.8/sql/sql_plugin.cc --- mysql-5.5.8.orig/sql/sql_plugin.cc 2010-12-03 12:58:26.000000000 -0500 +++ mysql-5.5.8/sql/sql_plugin.cc 2011-02-01 20:34:10.218305349 -0500 -@@ -2024,7 +2024,7 @@ +@@ -2160,7 +2160,7 @@ goto err; result= (int) tmp; } diff --git a/SOURCES/mysql-pluginerrmsg.patch b/SOURCES/mysql-pluginerrmsg.patch index c998ee7..3302d8d 100644 --- a/SOURCES/mysql-pluginerrmsg.patch +++ b/SOURCES/mysql-pluginerrmsg.patch @@ -38,7 +38,7 @@ diff -up mysql-5.5.34/sql/share/errmsg-utf8.txt.p28 mysql-5.5.34/sql/share/errms diff -up mysql-5.5.34/sql/sql_plugin.cc.p28 mysql-5.5.34/sql/sql_plugin.cc --- mysql-5.5.34/sql/sql_plugin.cc.p28 2013-10-10 12:09:03.837687101 +0200 +++ mysql-5.5.34/sql/sql_plugin.cc 2013-10-10 12:09:03.937687128 +0200 -@@ -1909,9 +1909,7 @@ bool mysql_uninstall_plugin(THD *thd, co +@@ -1929,9 +1929,7 @@ bool mysql_uninstall_plugin(THD *thd, co } if (!plugin->plugin_dl) { diff --git a/SOURCES/mysql-s390-tsc.patch b/SOURCES/mysql-s390-tsc.patch index 00811a4..4e5fb76 100644 --- a/SOURCES/mysql-s390-tsc.patch +++ b/SOURCES/mysql-s390-tsc.patch @@ -5,7 +5,7 @@ Filed upstream at http://bugs.mysql.com/bug.php?id=59953 diff -Naur mysql-5.5.8.orig/include/my_rdtsc.h mysql-5.5.8/include/my_rdtsc.h --- mysql-5.5.8.orig/include/my_rdtsc.h 2010-12-03 12:58:24.000000000 -0500 +++ mysql-5.5.8/include/my_rdtsc.h 2011-02-04 11:16:45.431459913 -0500 -@@ -124,6 +124,7 @@ +@@ -125,6 +125,7 @@ #define MY_TIMER_ROUTINE_MACH_ABSOLUTE_TIME 25 #define MY_TIMER_ROUTINE_GETSYSTEMTIMEASFILETIME 26 #define MY_TIMER_ROUTINE_ASM_SUNPRO_X86_64 27 diff --git a/SOURCES/mysql-stack-guard.patch b/SOURCES/mysql-stack-guard.patch index 0634560..be039dc 100644 --- a/SOURCES/mysql-stack-guard.patch +++ b/SOURCES/mysql-stack-guard.patch @@ -11,7 +11,7 @@ Filed upstream at http://bugs.mysql.com/bug.php?id=35019 diff -Naur mysql-5.5.8.orig/sql/mysqld.cc mysql-5.5.8/sql/mysqld.cc --- mysql-5.5.8.orig/sql/mysqld.cc 2010-12-03 12:58:26.000000000 -0500 +++ mysql-5.5.8/sql/mysqld.cc 2010-12-20 22:01:08.939186906 -0500 -@@ -2602,6 +2602,70 @@ +@@ -2608,6 +2608,70 @@ } @@ -82,7 +82,7 @@ diff -Naur mysql-5.5.8.orig/sql/mysqld.cc mysql-5.5.8/sql/mysqld.cc static void start_signal_handler(void) { int error; -@@ -2612,15 +2676,7 @@ +@@ -2618,15 +2682,7 @@ #if !defined(HAVE_DEC_3_2_THREADS) pthread_attr_setscope(&thr_attr,PTHREAD_SCOPE_SYSTEM); (void) pthread_attr_setdetachstate(&thr_attr,PTHREAD_CREATE_DETACHED); @@ -99,7 +99,7 @@ diff -Naur mysql-5.5.8.orig/sql/mysqld.cc mysql-5.5.8/sql/mysqld.cc #endif mysql_mutex_lock(&LOCK_thread_count); -@@ -4361,36 +4417,8 @@ +@@ -4474,36 +4530,8 @@ unireg_abort(1); // Will do exit init_signals(); diff --git a/SOURCES/mysql-string-overflow.patch b/SOURCES/mysql-string-overflow.patch index eaa11e8..0571a15 100644 --- a/SOURCES/mysql-string-overflow.patch +++ b/SOURCES/mysql-string-overflow.patch @@ -10,7 +10,7 @@ Error: BUFFER_SIZE_WARNING: diff -Naur mysql-5.5.23.orig/sql/sql_prepare.cc mysql-5.5.23/sql/sql_prepare.cc --- mysql-5.5.23.orig/sql/sql_prepare.cc 2012-03-29 15:07:12.000000000 -0400 +++ mysql-5.5.23/sql/sql_prepare.cc 2012-04-27 22:19:09.196076848 -0400 -@@ -2871,7 +2871,7 @@ +@@ -2881,7 +2881,7 @@ { stmt->state= Query_arena::STMT_ERROR; stmt->last_errno= thd->stmt_da->sql_errno(); @@ -28,7 +28,7 @@ Error: STRING_OVERFLOW: diff -Naur mysql-5.5.23.orig/sql/sql_trigger.cc mysql-5.5.23/sql/sql_trigger.cc --- mysql-5.5.23.orig/sql/sql_trigger.cc 2012-03-29 15:07:12.000000000 -0400 +++ mysql-5.5.23/sql/sql_trigger.cc 2012-04-27 22:19:09.198076947 -0400 -@@ -2260,7 +2260,7 @@ +@@ -2267,7 +2267,7 @@ void Table_triggers_list::set_parse_error_message(char *error_message) { m_has_unparseable_trigger= true; @@ -46,7 +46,7 @@ Error: STRING_OVERFLOW: diff -Naur mysql-5.5.23.orig/storage/innobase/handler/ha_innodb.cc mysql-5.5.23/storage/innobase/handler/ha_innodb.cc --- mysql-5.5.23.orig/storage/innobase/handler/ha_innodb.cc 2012-03-29 15:07:11.000000000 -0400 +++ mysql-5.5.23/storage/innobase/handler/ha_innodb.cc 2012-04-27 22:19:09.201077088 -0400 -@@ -7023,7 +7023,7 @@ +@@ -7074,7 +7074,7 @@ ut_a(strlen(name) < sizeof(name2)); diff --git a/SOURCES/mysql-strmov.patch b/SOURCES/mysql-strmov.patch index 3d8ccec..5350502 100644 --- a/SOURCES/mysql-strmov.patch +++ b/SOURCES/mysql-strmov.patch @@ -16,7 +16,7 @@ this patch. diff -Naur mysql-5.5.8.orig/include/m_string.h mysql-5.5.8/include/m_string.h --- mysql-5.5.8.orig/include/m_string.h 2010-12-03 12:58:24.000000000 -0500 +++ mysql-5.5.8/include/m_string.h 2010-12-20 21:39:13.905186372 -0500 -@@ -74,15 +74,6 @@ +@@ -77,15 +77,6 @@ extern void *(*my_str_malloc)(size_t); extern void (*my_str_free)(void *); diff --git a/SOURCES/mysql-va-list.patch b/SOURCES/mysql-va-list.patch index a76d0eb..89158d3 100644 --- a/SOURCES/mysql-va-list.patch +++ b/SOURCES/mysql-va-list.patch @@ -7,7 +7,7 @@ Per bug #744707. diff -Naur mysql-5.5.16.orig/sql-common/client_plugin.c mysql-5.5.16/sql-common/client_plugin.c --- mysql-5.5.16.orig/sql-common/client_plugin.c 2011-09-09 11:56:39.000000000 -0400 +++ mysql-5.5.16/sql-common/client_plugin.c 2011-10-16 23:00:00.708799138 -0400 -@@ -228,11 +228,13 @@ +@@ -233,11 +233,13 @@ { MYSQL mysql; struct st_mysql_client_plugin **builtin; @@ -21,7 +21,7 @@ diff -Naur mysql-5.5.16.orig/sql-common/client_plugin.c mysql-5.5.16/sql-common/ pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW); init_alloc_root(&mem_root, 128, 128); -@@ -244,7 +246,7 @@ +@@ -249,7 +251,7 @@ pthread_mutex_lock(&LOCK_load_client_plugin); for (builtin= mysql_client_builtins; *builtin; builtin++) @@ -30,7 +30,7 @@ diff -Naur mysql-5.5.16.orig/sql-common/client_plugin.c mysql-5.5.16/sql-common/ pthread_mutex_unlock(&LOCK_load_client_plugin); -@@ -288,9 +290,13 @@ +@@ -293,9 +295,13 @@ mysql_client_register_plugin(MYSQL *mysql, struct st_mysql_client_plugin *plugin) { @@ -44,7 +44,7 @@ diff -Naur mysql-5.5.16.orig/sql-common/client_plugin.c mysql-5.5.16/sql-common/ pthread_mutex_lock(&LOCK_load_client_plugin); /* make sure the plugin wasn't loaded meanwhile */ -@@ -302,7 +308,7 @@ +@@ -307,7 +313,7 @@ plugin= NULL; } else diff --git a/SOURCES/mysql-versioning.patch b/SOURCES/mysql-versioning.patch index aaaa828..8ca8180 100644 --- a/SOURCES/mysql-versioning.patch +++ b/SOURCES/mysql-versioning.patch @@ -7,7 +7,7 @@ symbols and jam it into the build with this hack. diff -Naur mysql-5.5.8.orig/libmysql/CMakeLists.txt mysql-5.5.8/libmysql/CMakeLists.txt --- mysql-5.5.8.orig/libmysql/CMakeLists.txt 2010-12-03 12:58:26.000000000 -0500 +++ mysql-5.5.8/libmysql/CMakeLists.txt 2010-12-21 21:00:07.135311386 -0500 -@@ -197,7 +197,7 @@ +@@ -225,7 +225,7 @@ SET(libmysql_link_flags) ENDIF() SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS diff --git a/SPECS/mysql.spec b/SPECS/mysql.spec index 11b8b1f..6b7a148 100644 --- a/SPECS/mysql.spec +++ b/SPECS/mysql.spec @@ -1,7 +1,7 @@ %{?scl:%scl_package mysql} Name: %{?scl_prefix}mysql -Version: 5.5.45 +Version: 5.5.50 Release: 1%{?dist} Summary: MySQL client programs and shared libraries @@ -58,7 +58,6 @@ Patch18: mysql-cipherspec.patch Patch19: mysql-file-contents.patch Patch20: mysql-string-overflow.patch Patch23: mysql-innodbwarn.patch -Patch25: mysql-man-pages.patch Patch26: mysql-covscan-stroverflow.patch Patch27: mysql-covscan-signexpr.patch Patch28: mysql-pluginerrmsg.patch @@ -195,7 +194,6 @@ the MySQL sources. %patch19 -p1 %patch20 -p1 %patch23 -p1 -%patch25 -p1 %patch26 -p1 %patch27 -p1 %patch28 -p1 @@ -677,6 +675,10 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/solaris/postinstall-solaris %{_mandir}/man1/mysql_client_test.1* %changelog +* Tue Jun 7 2016 Jakub Dorňák - 5.5.50-1 +- Rebase to 5.5.50 + Resolves: #1342440 + * Wed Jul 29 2015 Jakub Dorňák - 5.5.45-1 - Rebase to 5.5.45 Related: #1247023