diff --git a/.gitignore b/.gitignore
index a564316..e2985e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/mysql-5.5.37.tar.gz
+SOURCES/mysql-5.5.40.tar.gz
diff --git a/.mysql55-mysql.metadata b/.mysql55-mysql.metadata
index ed53fa4..6303993 100644
--- a/.mysql55-mysql.metadata
+++ b/.mysql55-mysql.metadata
@@ -1 +1 @@
-b5f15ff72c86358693c250203e7cb9c20fbe5f7f SOURCES/mysql-5.5.37.tar.gz
+b93a1b14ab2de390014e99b4293e7835da133196 SOURCES/mysql-5.5.40.tar.gz
diff --git a/SOURCES/mysql-man-pages.patch b/SOURCES/mysql-man-pages.patch
index e172797..7e5edec 100644
--- a/SOURCES/mysql-man-pages.patch
+++ b/SOURCES/mysql-man-pages.patch
@@ -1,7 +1,7 @@
-diff -up mysql-5.5.37/man/mysql.1.p24 mysql-5.5.37/man/mysql.1
---- mysql-5.5.37/man/mysql.1.p24	2014-03-14 19:58:40.000000000 +0100
-+++ mysql-5.5.37/man/mysql.1	2014-04-17 16:48:47.170301353 +0200
-@@ -137,7 +137,8 @@ Section\ \&4.2.3.4, \(lqCommand-Line Opt
+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,
@@ -11,7 +11,7 @@ diff -up mysql-5.5.37/man/mysql.1.p24 mysql-5.5.37/man/mysql.1
  .sp
  Display a help message and exit\&.
  .RE
-@@ -313,6 +314,21 @@ Compress all information sent between th
+@@ -332,6 +333,21 @@ Compress all information sent between th
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -33,7 +33,7 @@ diff -up mysql-5.5.37/man/mysql.1.p24 mysql-5.5.37/man/mysql.1
  .\" mysql: database option
  .\" database option: mysql
  \fB\-\-database=\fR\fB\fIdb_name\fR\fR,
-@@ -426,6 +442,37 @@ Section\ \&10.5, \(lqCharacter Set Confi
+@@ -509,6 +525,37 @@ groups\&.
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -71,7 +71,7 @@ diff -up mysql-5.5.37/man/mysql.1.p24 mysql-5.5.37/man/mysql.1
  .\" mysql: delimiter option
  .\" delimiter option: mysql
  \fB\-\-delimiter=\fR\fB\fIstr\fR\fR
-@@ -625,6 +672,36 @@ has no effect if the server does not als
+@@ -708,6 +755,36 @@ has no effect if the server does not als
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -108,7 +108,7 @@ diff -up mysql-5.5.37/man/mysql.1.p24 mysql-5.5.37/man/mysql.1
  .\" mysql: named-commands option
  .\" named-commands option: mysql
  \fB\-\-named\-commands\fR,
-@@ -650,13 +727,28 @@ the section called \(lqMYSQL COMMANDS\(r
+@@ -733,6 +810,21 @@ the section called \(lqMYSQL COMMANDS\(r
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -130,15 +130,7 @@ diff -up mysql-5.5.37/man/mysql.1.p24 mysql-5.5.37/man/mysql.1
  .\" mysql: no-auto-rehash option
  .\" no-auto-rehash option: mysql
  \fB\-\-no\-auto\-rehash\fR,
- \fB\-A\fR
- .sp
- This has the same effect as
--\fB\-skip\-auto\-rehash\fR\&. See the description for
-+\fB\-\-skip\-auto\-rehash\fR\&. See the description for
- \fB\-\-auto\-rehash\fR\&.
- .RE
- .sp
-@@ -684,6 +776,21 @@ Do not beep when errors occur\&.
+@@ -784,6 +876,21 @@ can be used to prevent them from being r
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -160,7 +152,7 @@ diff -up mysql-5.5.37/man/mysql.1.p24 mysql-5.5.37/man/mysql.1
  .\" mysql: no-named-commands option
  .\" no-named-commands option: mysql
  \fB\-\-no\-named\-commands\fR,
-@@ -954,6 +1061,21 @@ The TCP/IP port number to use for the co
+@@ -1069,6 +1176,21 @@ Print the program name and all options t
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -182,7 +174,7 @@ diff -up mysql-5.5.37/man/mysql.1.p24 mysql-5.5.37/man/mysql.1
  .\" mysql: prompt option
  .\" prompt option: mysql
  \fB\-\-prompt=\fR\fB\fIformat_str\fR\fR
-@@ -1132,6 +1254,36 @@ Passwords that use the pre\-4\&.1 hashin
+@@ -1267,6 +1389,36 @@ option to enable shared\-memory connecti
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -219,7 +211,7 @@ diff -up mysql-5.5.37/man/mysql.1.p24 mysql-5.5.37/man/mysql.1
  .\" mysql: show-warnings option
  .\" show-warnings option: mysql
  \fB\-\-show\-warnings\fR
-@@ -1185,6 +1337,21 @@ option\&.
+@@ -1320,6 +1472,21 @@ option\&.
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -241,7 +233,7 @@ diff -up mysql-5.5.37/man/mysql.1.p24 mysql-5.5.37/man/mysql.1
  .\" mysql: skip-column-names option
  .\" skip-column-names option: mysql
  \fB\-\-skip\-column\-names\fR,
-@@ -1239,7 +1406,7 @@ localhost, the Unix socket file to use,
+@@ -1374,7 +1541,7 @@ localhost, the Unix socket file to use,
  \fB\-\-ssl*\fR
  .sp
  Options that begin with
@@ -250,7 +242,7 @@ diff -up mysql-5.5.37/man/mysql.1.p24 mysql-5.5.37/man/mysql.1
  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
-@@ -1415,7 +1582,7 @@ The XML output also uses an XML namespac
+@@ -1550,7 +1717,7 @@ The XML output also uses an XML namespac
  .RS 4
  .\}
  .nf
@@ -259,7 +251,7 @@ diff -up mysql-5.5.37/man/mysql.1.p24 mysql-5.5.37/man/mysql.1
  <?xml version="1\&.0"?>
  <resultset statement="SHOW VARIABLES LIKE \*(Aqversion%\*(Aq" xmlns:xsi="http://www\&.w3\&.org/2001/XMLSchema\-instance">
  <row>
-@@ -3164,16 +3331,16 @@ statements that probably need to examine
+@@ -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
@@ -279,10 +271,10 @@ diff -up mysql-5.5.37/man/mysql.1.p24 mysql-5.5.37/man/mysql.1
  .fi
  .if n \{\
  .RE
-diff -up mysql-5.5.37/man/mysqladmin.1.p24 mysql-5.5.37/man/mysqladmin.1
---- mysql-5.5.37/man/mysqladmin.1.p24	2014-03-14 19:58:40.000000000 +0100
-+++ mysql-5.5.37/man/mysqladmin.1	2014-04-17 16:48:47.167301353 +0200
-@@ -689,6 +689,21 @@ Compress all information sent between th
+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
  .\}
@@ -304,7 +296,7 @@ diff -up mysql-5.5.37/man/mysqladmin.1.p24 mysql-5.5.37/man/mysqladmin.1
  .\" mysqladmin: count option
  .\" count option: mysqladmin
  \fB\-\-count=\fR\fB\fIN\fR\fR,
-@@ -793,6 +808,37 @@ Section\ \&10.5, \(lqCharacter Set Confi
+@@ -855,6 +870,37 @@ groups\&.
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -342,7 +334,7 @@ diff -up mysql-5.5.37/man/mysqladmin.1.p24 mysql-5.5.37/man/mysqladmin.1
  .\" mysqladmin: enable-cleartext-plugin option
  .\" enable-cleartext-plugin option: mysqladmin
  \fB\-\-enable\-cleartext\-plugin\fR
-@@ -861,6 +907,21 @@ Suppress the warning beep that is emitte
+@@ -940,6 +986,21 @@ can be used to prevent them from being r
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -364,7 +356,7 @@ diff -up mysql-5.5.37/man/mysqladmin.1.p24 mysql-5.5.37/man/mysqladmin.1
  .\" mysqladmin: password option
  .\" password option: mysqladmin
  \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
-@@ -944,6 +1005,21 @@ The TCP/IP port number to use for the co
+@@ -1038,6 +1099,21 @@ Print the program name and all options t
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -386,7 +378,7 @@ diff -up mysql-5.5.37/man/mysqladmin.1.p24 mysql-5.5.37/man/mysqladmin.1
  .\" mysqladmin: protocol option
  .\" protocol option: mysqladmin
  \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
-@@ -973,6 +1049,21 @@ command\&.
+@@ -1067,6 +1143,21 @@ command\&.
  .RE
  .sp
  .RS 4
@@ -408,10 +400,10 @@ diff -up mysql-5.5.37/man/mysqladmin.1.p24 mysql-5.5.37/man/mysqladmin.1
  .ie n \{\
  \h'-04'\(bu\h'+03'\c
  .\}
-diff -up mysql-5.5.37/man/mysqlbinlog.1.p24 mysql-5.5.37/man/mysqlbinlog.1
---- mysql-5.5.37/man/mysqlbinlog.1.p24	2014-03-14 19:58:40.000000000 +0100
-+++ mysql-5.5.37/man/mysqlbinlog.1	2014-04-17 16:48:47.168301353 +0200
-@@ -599,6 +599,7 @@ privilege\&.
+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\&.
@@ -419,7 +411,7 @@ diff -up mysql-5.5.37/man/mysqlbinlog.1.p24 mysql-5.5.37/man/mysqlbinlog.1
  .RE
  .sp
  .RS 4
-@@ -708,6 +709,22 @@ entries in the log\&.
+@@ -785,6 +786,22 @@ can be used to prevent them from being r
  .RE
  .sp
  .RS 4
@@ -442,10 +434,10 @@ diff -up mysql-5.5.37/man/mysqlbinlog.1.p24 mysql-5.5.37/man/mysqlbinlog.1
  .ie n \{\
  \h'-04'\(bu\h'+03'\c
  .\}
-diff -up mysql-5.5.37/man/mysqlcheck.1.p24 mysql-5.5.37/man/mysqlcheck.1
---- mysql-5.5.37/man/mysqlcheck.1.p24	2014-03-14 19:58:40.000000000 +0100
-+++ mysql-5.5.37/man/mysqlcheck.1	2014-04-17 16:48:47.169301353 +0200
-@@ -490,6 +490,38 @@ Section\ \&10.5, \(lqCharacter Set Confi
+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
  .\}
@@ -484,7 +476,7 @@ diff -up mysql-5.5.37/man/mysqlcheck.1.p24 mysql-5.5.37/man/mysqlcheck.1
  .\" mysqlcheck: extended option
  .\" extended option: mysqlcheck
  \fB\-\-extended\fR,
-@@ -622,6 +654,21 @@ operation\&. This finds only 99\&.99% of
+@@ -717,6 +749,21 @@ can be used to prevent them from being r
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -506,7 +498,7 @@ diff -up mysql-5.5.37/man/mysqlcheck.1.p24 mysql-5.5.37/man/mysqlcheck.1
  .\" mysqlcheck: optimize option
  .\" optimize option: mysqlcheck
  \fB\-\-optimize\fR,
-@@ -714,6 +761,22 @@ The TCP/IP port number to use for the co
+@@ -809,6 +856,22 @@ The TCP/IP port number to use for the co
  .RE
  .sp
  .RS 4
@@ -529,9 +521,9 @@ diff -up mysql-5.5.37/man/mysqlcheck.1.p24 mysql-5.5.37/man/mysqlcheck.1
  .ie n \{\
  \h'-04'\(bu\h'+03'\c
  .\}
-diff -up mysql-5.5.37/man/mysql_config.1.p24 mysql-5.5.37/man/mysql_config.1
---- mysql-5.5.37/man/mysql_config.1.p24	2014-03-14 19:58:40.000000000 +0100
-+++ mysql-5.5.37/man/mysql_config.1	2014-04-17 16:48:47.168301353 +0200
+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
@@ -555,10 +547,10 @@ diff -up mysql-5.5.37/man/mysql_config.1.p24 mysql-5.5.37/man/mysql_config.1
  .\" mysql_config: version option
  .\" version option: mysql_config
  \fB\-\-version\fR
-diff -up mysql-5.5.37/man/mysqldump.1.p24 mysql-5.5.37/man/mysqldump.1
---- mysql-5.5.37/man/mysqldump.1.p24	2014-03-14 19:58:40.000000000 +0100
-+++ mysql-5.5.37/man/mysqldump.1	2014-04-17 16:48:47.168301353 +0200
-@@ -693,7 +693,8 @@ Compress all information sent between th
+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
@@ -568,7 +560,7 @@ diff -up mysql-5.5.37/man/mysqldump.1.p24 mysql-5.5.37/man/mysqldump.1
  .sp
  Include all MySQL\-specific table options in the
  CREATE TABLE
-@@ -820,6 +821,38 @@ latin1\&.
+@@ -880,6 +881,38 @@ groups\&.
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -607,7 +599,7 @@ diff -up mysql-5.5.37/man/mysqldump.1.p24 mysql-5.5.37/man/mysqldump.1
  .\" mysqldump: delayed-insert option
  .\" delayed-insert option: mysqldump
  \fB\-\-delayed\-insert\fR
-@@ -1497,6 +1530,36 @@ to point the slave to the correct master
+@@ -1557,6 +1590,36 @@ to point the slave to the correct master
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -644,7 +636,7 @@ diff -up mysql-5.5.37/man/mysqldump.1.p24 mysql-5.5.37/man/mysqldump.1
  .\" mysqldump: no-autocommit option
  .\" no-autocommit option: mysqldump
  \fB\-\-no\-autocommit\fR
-@@ -1597,6 +1660,21 @@ statement for the table (for example, to
+@@ -1674,6 +1737,21 @@ can be used to prevent them from being r
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -666,7 +658,7 @@ diff -up mysql-5.5.37/man/mysqldump.1.p24 mysql-5.5.37/man/mysqldump.1
  .\" mysqldump: no-set-names option
  .\" no-set-names option: mysqldump
  \fB\-\-no\-set\-names\fR,
-@@ -1757,6 +1835,21 @@ The TCP/IP port number to use for the co
+@@ -1834,6 +1912,21 @@ The TCP/IP port number to use for the co
  .RE
  .sp
  .RS 4
@@ -688,10 +680,10 @@ diff -up mysql-5.5.37/man/mysqldump.1.p24 mysql-5.5.37/man/mysqldump.1
  .ie n \{\
  \h'-04'\(bu\h'+03'\c
  .\}
-diff -up mysql-5.5.37/man/mysqlimport.1.p24 mysql-5.5.37/man/mysqlimport.1
---- mysql-5.5.37/man/mysqlimport.1.p24	2014-03-14 19:58:40.000000000 +0100
-+++ mysql-5.5.37/man/mysqlimport.1	2014-04-17 16:48:47.169301353 +0200
-@@ -260,10 +260,42 @@ This option was added in MySQL 5\&.5\&.1
+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
  .\}
@@ -735,7 +727,7 @@ diff -up mysql-5.5.37/man/mysqlimport.1.p24 mysql-5.5.37/man/mysqlimport.1
  .sp
  Empty the table before importing the text file\&.
  .RE
-@@ -445,6 +477,22 @@ MERGE)\&.
+@@ -524,6 +556,22 @@ can be used to prevent them from being r
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -758,7 +750,7 @@ diff -up mysql-5.5.37/man/mysqlimport.1.p24 mysql-5.5.37/man/mysqlimport.1
  .\" mysqlimport: password option
  .\" password option: mysqlimport
  \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
-@@ -521,6 +569,22 @@ The TCP/IP port number to use for the co
+@@ -600,6 +648,22 @@ The TCP/IP port number to use for the co
  .RE
  .sp
  .RS 4
@@ -781,10 +773,10 @@ diff -up mysql-5.5.37/man/mysqlimport.1.p24 mysql-5.5.37/man/mysqlimport.1
  .ie n \{\
  \h'-04'\(bu\h'+03'\c
  .\}
-diff -up mysql-5.5.37/man/mysqlshow.1.p24 mysql-5.5.37/man/mysqlshow.1
---- mysql-5.5.37/man/mysqlshow.1.p24	2014-03-14 19:58:40.000000000 +0100
-+++ mysql-5.5.37/man/mysqlshow.1	2014-04-17 16:48:47.170301353 +0200
-@@ -175,7 +175,8 @@ that is supplied with MySQL Cluster\&. I
+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
@@ -794,7 +786,7 @@ diff -up mysql-5.5.37/man/mysqlshow.1.p24 mysql-5.5.37/man/mysqlshow.1
  .sp
  The directory where character sets are installed\&. See
  Section\ \&10.5, \(lqCharacter Set Configuration\(rq\&.
-@@ -307,6 +308,38 @@ This option was added in MySQL 5\&.5\&.1
+@@ -369,6 +370,38 @@ groups\&.
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -833,7 +825,7 @@ diff -up mysql-5.5.37/man/mysqlshow.1.p24 mysql-5.5.37/man/mysqlshow.1
  .\" mysqlshow: host option
  .\" host option: mysqlshow
  \fB\-\-host=\fR\fB\fIhost_name\fR\fR,
-@@ -339,6 +372,22 @@ Show table indexes\&.
+@@ -418,6 +451,22 @@ can be used to prevent them from being r
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -856,7 +848,7 @@ diff -up mysql-5.5.37/man/mysqlshow.1.p24 mysql-5.5.37/man/mysqlshow.1
  .\" mysqlshow: password option
  .\" password option: mysqlshow
  \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
-@@ -415,6 +464,22 @@ The TCP/IP port number to use for the co
+@@ -494,6 +543,22 @@ The TCP/IP port number to use for the co
  .RE
  .sp
  .RS 4
@@ -879,10 +871,10 @@ diff -up mysql-5.5.37/man/mysqlshow.1.p24 mysql-5.5.37/man/mysqlshow.1
  .ie n \{\
  \h'-04'\(bu\h'+03'\c
  .\}
-diff -up mysql-5.5.37/man/mysqlslap.1.p24 mysql-5.5.37/man/mysqlslap.1
---- mysql-5.5.37/man/mysqlslap.1.p24	2014-03-14 19:58:40.000000000 +0100
-+++ mysql-5.5.37/man/mysqlslap.1	2014-04-17 16:48:47.170301353 +0200
-@@ -526,6 +526,38 @@ This option was added in MySQL 5\&.5\&.1
+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
@@ -921,7 +913,7 @@ diff -up mysql-5.5.37/man/mysqlslap.1.p24 mysql-5.5.37/man/mysqlslap.1
  .\}
  .\" mysqlslap: delimiter option
  .\" delimiter option: mysqlslap
-@@ -643,6 +675,37 @@ from dropping any schema it creates duri
+@@ -722,6 +754,37 @@ can be used to prevent them from being r
  .sp -1
  .IP \(bu 2.3
  .\}
@@ -959,7 +951,7 @@ diff -up mysql-5.5.37/man/mysqlslap.1.p24 mysql-5.5.37/man/mysqlslap.1
  .\" mysqlslap: number-char-cols option
  .\" number-char-cols option: mysqlslap
  \fB\-\-number\-char\-cols=\fR\fB\fIN\fR\fR,
-@@ -821,6 +884,22 @@ The file or string containing the statem
+@@ -900,6 +963,22 @@ The file or string containing the statem
  .RE
  .sp
  .RS 4
diff --git a/SOURCES/mysql-pluginerrmsg.patch b/SOURCES/mysql-pluginerrmsg.patch
index 954c5a3..c998ee7 100644
--- a/SOURCES/mysql-pluginerrmsg.patch
+++ b/SOURCES/mysql-pluginerrmsg.patch
@@ -23,29 +23,6 @@ diff -up mysql-5.5.34/include/mysql.h.p28 mysql-5.5.34/include/mysql.h
  
  typedef struct st_mysql_rows {
    struct st_mysql_rows *next;		/* list of rows */
-diff -up mysql-5.5.34/mysql-test/r/plugin.result.p28 mysql-5.5.34/mysql-test/r/plugin.result
---- mysql-5.5.34/mysql-test/r/plugin.result.p28	2013-09-09 20:01:38.000000000 +0200
-+++ mysql-5.5.34/mysql-test/r/plugin.result	2013-10-10 12:09:03.935687127 +0200
-@@ -143,3 +143,5 @@ SELECT @@SESSION.example_double_thdvar;
- @@SESSION.example_double_thdvar
- 1000.500000
- UNINSTALL PLUGIN example;
-+UNINSTALL PLUGIN MyISAM;
-+ERROR HY000: Built-in plugins cannot be deleted
-diff -up mysql-5.5.34/mysql-test/t/plugin.test.p28 mysql-5.5.34/mysql-test/t/plugin.test
---- mysql-5.5.34/mysql-test/t/plugin.test.p28	2013-09-09 20:01:38.000000000 +0200
-+++ mysql-5.5.34/mysql-test/t/plugin.test	2013-10-10 12:09:03.935687127 +0200
-@@ -137,3 +137,10 @@ SET SESSION example_double_thdvar = 1000
- SELECT @@SESSION.example_double_thdvar;
- 
- UNINSTALL PLUGIN example;
-+
-+#
-+# MDEV-4573 UNINSTALL PLUGIN misleading error message for non-dynamic plugins
-+#
-+--error ER_PLUGIN_DELETE_BUILTIN
-+UNINSTALL PLUGIN MyISAM;
-+
 diff -up mysql-5.5.34/sql/share/errmsg-utf8.txt.p28 mysql-5.5.34/sql/share/errmsg-utf8.txt
 --- mysql-5.5.34/sql/share/errmsg-utf8.txt.p28	2013-09-09 20:01:38.000000000 +0200
 +++ mysql-5.5.34/sql/share/errmsg-utf8.txt	2013-10-10 12:09:03.936687128 +0200
diff --git a/SPECS/mysql.spec b/SPECS/mysql.spec
index 2f806d3..04f46c8 100644
--- a/SPECS/mysql.spec
+++ b/SPECS/mysql.spec
@@ -1,8 +1,8 @@
 %{?scl:%scl_package mysql}
 
 Name: %{?scl_prefix}mysql
-Version: 5.5.37
-Release: 5%{?dist}
+Version: 5.5.40
+Release: 1%{?dist}
 
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
@@ -679,6 +679,13 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/solaris/postinstall-solaris
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Thu Nov 06 2014 Matej Muzila <mmuzila@redhat.com> - 5.5.40-1
+- Rebase to MySQL 5.5.40
+  Also fixes: CVE-2014-4274 CVE-2014-4287 CVE-2014-6463 CVE-2014-6464
+  CVE-2014-6469 CVE-2014-6484 CVE-2014-6505 CVE-2014-6507 CVE-2014-6520
+  CVE-2014-6530 CVE-2014-6551 CVE-2014-6555
+  Resolves: #1160515
+
 * Thu Apr 17 2014 Honza Horak <hhorak@redhat.com> - 5.5.37-5
 - Update to MySQL 5.5.37, for various fixes described at
   http://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-37.html