Merge lp:~laurynas-biveinis/percona-server/merge-5.5.36 into lp:percona-server/5.5

[Laurynas Biveinis]

http://jenkins.percona.com/job/percona-server-5.5-param/939/

Merge MySQL 5.6.36,
https://blueprints.launchpad.net/percona-server/+spec/merge-5.5.36.
The merge is trivial, except for the revert of our fix for bug 1182572
/ upstream http://bugs.mysql.com/bug.php?id=68354.

This merge also takes an upstream fix for bug 691601 /
http://bugs.mysql.com/bug.php?id=61746.

Import updated man pages from mysql-5.5.36.tar.gz.

[Sergei Glushchenko (sergei.glushchenko)]

Apart from a bunch of copyright changes this MP is relatively small. Approved, and since it is g2 review also changed status.

review: Approve (g2)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-14 11:57:01 +0000
+++ CMakeLists.txt	2014-02-03 08:11:10 +0000
@@ -342,6 +342,15 @@
   SET(DEFAULT_SYSCONFDIR "${SYSCONFDIR}")
 ENDIF()
 
+OPTION(TMPDIR
+"PATH to MySQL TMP dir. If unspecified, defaults to P_tmpdir in <stdio.h>" OFF)
+IF(TMPDIR)
+  # Quote it, to make it a const char string.
+  SET(DEFAULT_TMPDIR "\"${TMPDIR}\"")
+ELSE()
+  # Do not quote it, to refer to the P_tmpdir macro in <stdio.h>.
+  SET(DEFAULT_TMPDIR "P_tmpdir")
+ENDIF()
 
 # Run platform tests
 INCLUDE(configure.cmake)
@@ -419,6 +428,7 @@
     ADD_SUBDIRECTORY(internal)
   ENDIF()
   ADD_SUBDIRECTORY(packaging/rpm-uln)
+  ADD_SUBDIRECTORY(packaging/rpm-oel)
 ENDIF()
 
 INCLUDE(cmake/abi_check.cmake)
 
=== modified file 'Makefile-ps'
--- Makefile-ps	2014-01-14 11:57:01 +0000
+++ Makefile-ps	2014-02-03 08:11:10 +0000
@@ -1,5 +1,5 @@
-MYSQL_VERSION=5.5.35
-PERCONA_SERVER_VERSION=rel32.0
+MYSQL_VERSION=5.5.36
+PERCONA_SERVER_VERSION=rel34.0
 PERCONA_SERVER         ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
 PERCONA_SERVER_SHORT_2 ?=Percona-Server
 
=== modified file 'README.MySQL'
--- README.MySQL	2013-10-08 05:03:31 +0000
+++ README.MySQL	2014-02-03 08:11:10 +0000
@@ -5,7 +5,7 @@
 is released under the version 2 of the GNU General Public License. 
 MySQL is brought to you by Oracle.
 
-Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
 License information can be found in the COPYING file.
 
 
=== modified file 'VERSION'
--- VERSION	2014-01-14 11:57:01 +0000
+++ VERSION	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=35
-MYSQL_VERSION_EXTRA=-33.1
+MYSQL_VERSION_PATCH=36
+MYSQL_VERSION_EXTRA=-34.0
 
=== modified file 'client/mysql_plugin.c'
--- client/mysql_plugin.c	2013-09-05 08:48:43 +0000
+++ client/mysql_plugin.c	2014-02-03 08:11:10 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -856,7 +856,7 @@
       strncat(buff, FN_DIRSEP, sizeof(buff) - strlen(buff) - 1);
 #endif
       buff[sizeof(buff) - 1]= 0;
-      my_delete(opt_basedir, MYF(0));
+      my_free(opt_basedir);
       opt_basedir= my_strdup(buff, MYF(MY_FAE));
     }
   }
 
=== modified file 'client/mysqlcheck.c'
--- client/mysqlcheck.c	2013-02-26 05:35:17 +0000
+++ client/mysqlcheck.c	2014-02-03 08:11:10 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'cmake/zlib.cmake'
--- cmake/zlib.cmake	2013-02-20 10:24:16 +0000
+++ cmake/zlib.cmake	2014-02-03 08:11:10 +0000
@@ -1,5 +1,4 @@
-# Copyright (c) 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'config.h.cmake'
--- config.h.cmake	2012-09-26 13:20:49 +0000
+++ config.h.cmake	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
  
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -600,6 +600,7 @@
 #cmakedefine DEFAULT_CHARSET_HOME "@DEFAULT_CHARSET_HOME@"
 #cmakedefine PLUGINDIR "@PLUGINDIR@"
 #cmakedefine DEFAULT_SYSCONFDIR "@DEFAULT_SYSCONFDIR@"
+#cmakedefine DEFAULT_TMPDIR @DEFAULT_TMPDIR@
 
 #cmakedefine SO_EXT "@CMAKE_SHARED_MODULE_SUFFIX@"
 
 
=== modified file 'extra/yassl/CMakeLists.txt'
--- extra/yassl/CMakeLists.txt	2013-10-09 05:40:46 +0000
+++ extra/yassl/CMakeLists.txt	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/yassl_error.hpp'
--- extra/yassl/include/yassl_error.hpp	2013-02-26 05:35:17 +0000
+++ extra/yassl/include/yassl_error.hpp	2014-02-03 08:11:10 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/yassl_types.hpp'
--- extra/yassl/include/yassl_types.hpp	2013-02-26 05:35:17 +0000
+++ extra/yassl/include/yassl_types.hpp	2014-02-03 08:11:10 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/src/handshake.cpp'
--- extra/yassl/src/handshake.cpp	2013-02-26 05:35:17 +0000
+++ extra/yassl/src/handshake.cpp	2014-02-03 08:11:10 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/src/yassl_error.cpp'
--- extra/yassl/src/yassl_error.cpp	2013-02-26 05:35:17 +0000
+++ extra/yassl/src/yassl_error.cpp	2014-02-03 08:11:10 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/src/yassl_imp.cpp'
--- extra/yassl/src/yassl_imp.cpp	2013-02-15 07:07:21 +0000
+++ extra/yassl/src/yassl_imp.cpp	2014-02-03 08:11:10 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/taocrypt/CMakeLists.txt'
--- extra/yassl/taocrypt/CMakeLists.txt	2013-10-09 05:40:46 +0000
+++ extra/yassl/taocrypt/CMakeLists.txt	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'include/my_getopt.h'
--- include/my_getopt.h	2013-10-09 05:59:54 +0000
+++ include/my_getopt.h	2014-02-03 08:11:10 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'include/my_net.h'
--- include/my_net.h	2013-03-19 14:53:48 +0000
+++ include/my_net.h	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'include/my_pthread.h'
--- include/my_pthread.h	2013-03-19 14:53:48 +0000
+++ include/my_pthread.h	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -134,7 +134,7 @@
 int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr);
 int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex);
 int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-			   struct timespec *abstime);
+			   const struct timespec *abstime);
 int pthread_cond_signal(pthread_cond_t *cond);
 int pthread_cond_broadcast(pthread_cond_t *cond);
 int pthread_cond_destroy(pthread_cond_t *cond);
 
=== modified file 'include/myisam.h'
--- include/myisam.h	2013-10-17 12:39:04 +0000
+++ include/myisam.h	2014-02-03 08:11:10 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'include/mysql/plugin.h'
--- include/mysql/plugin.h	2013-08-02 09:40:55 +0000
+++ include/mysql/plugin.h	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'include/mysql/plugin_audit.h'
--- include/mysql/plugin_audit.h	2013-07-02 06:28:39 +0000
+++ include/mysql/plugin_audit.h	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
 
=== modified file 'include/mysql/psi/mysql_thread.h'
--- include/mysql/psi/mysql_thread.h	2010-09-29 12:09:07 +0000
+++ include/mysql/psi/mysql_thread.h	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -988,7 +988,7 @@
 static inline int inline_mysql_cond_timedwait(
   mysql_cond_t *that,
   mysql_mutex_t *mutex,
-  struct timespec *abstime
+  const struct timespec *abstime
 #ifdef HAVE_PSI_INTERFACE
   , const char *src_file, uint src_line
 #endif
 
=== modified file 'include/welcome_copyright_notice.h'
--- include/welcome_copyright_notice.h	2013-08-21 07:39:21 +0000
+++ include/welcome_copyright_notice.h	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 #ifndef _welcome_copyright_notice_h_
 #define _welcome_copyright_notice_h_
 
-#define COPYRIGHT_NOTICE_CURRENT_YEAR "2013"
+#define COPYRIGHT_NOTICE_CURRENT_YEAR "2014"
 
 /*
   This define specifies copyright notice which is displayed by every MySQL
 
=== modified file 'libmysql/CMakeLists.txt'
--- libmysql/CMakeLists.txt	2014-01-14 11:57:01 +0000
+++ libmysql/CMakeLists.txt	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'libmysql/authentication_win/CMakeLists.txt'
--- libmysql/authentication_win/CMakeLists.txt	2013-10-09 05:40:46 +0000
+++ libmysql/authentication_win/CMakeLists.txt	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'libmysql/conf_to_src.c'
--- libmysql/conf_to_src.c	2013-03-19 14:53:48 +0000
+++ libmysql/conf_to_src.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'libmysql/libmysql.c'
--- libmysql/libmysql.c	2013-05-15 05:05:18 +0000
+++ libmysql/libmysql.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'libmysqld/lib_sql.cc'
--- libmysqld/lib_sql.cc	2013-10-22 13:33:14 +0000
+++ libmysqld/lib_sql.cc	2014-02-03 08:11:10 +0000
@@ -558,7 +558,7 @@
     opt_mysql_tmpdir=getenv("TMP");
 #endif
   if (!opt_mysql_tmpdir || !opt_mysql_tmpdir[0])
-    opt_mysql_tmpdir=(char*) P_tmpdir;		/* purecov: inspected */
+    opt_mysql_tmpdir= const_cast<char*>(DEFAULT_TMPDIR); /* purecov: inspected*/
 
   init_ssl();
   umask(((~my_umask) & 0666));
 
=== modified file 'man/comp_err.1'
--- man/comp_err.1	2013-12-05 08:07:26 +0000
+++ man/comp_err.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBcomp_err\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBCOMP_ERR\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBCOMP_ERR\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -264,7 +264,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/innochecksum.1'
--- man/innochecksum.1	2013-12-05 08:07:26 +0000
+++ man/innochecksum.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBinnochecksum\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBINNOCHECKSUM\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBINNOCHECKSUM\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -43,6 +43,8 @@
 tablespace file, calculates the checksum for each page, compares the calculated checksum to the stored checksum, and reports mismatches, which indicate damaged pages\&. It was originally developed to speed up verifying the integrity of tablespace files after power outages but can also be used after file copies\&. Because checksum mismatches will cause
 InnoDB
 to deliberately shut down a running server, it can be preferable to use this tool rather than waiting for a server in production usage to encounter the damaged pages\&.
+\fBinnochecksum\fR
+supports files up to 2GB in size\&.
 .PP
 \fBinnochecksum\fR
 cannot be used on tablespace files that the server already has open\&. For such files, you should use
@@ -150,7 +152,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/msql2mysql.1'
--- man/msql2mysql.1	2013-12-05 08:07:26 +0000
+++ man/msql2mysql.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmsql2mysql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMSQL2MYSQL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMSQL2MYSQL\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -69,7 +69,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/my_print_defaults.1'
--- man/my_print_defaults.1	2013-12-05 08:07:26 +0000
+++ man/my_print_defaults.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmy_print_defaults\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMY_PRINT_DEFAULTS" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMY_PRINT_DEFAULTS" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -204,7 +204,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/myisam_ftdump.1'
--- man/myisam_ftdump.1	2013-12-05 08:07:26 +0000
+++ man/myisam_ftdump.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmyisam_ftdump\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYISAM_FTDUMP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYISAM_FTDUMP\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -251,7 +251,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/myisamchk.1'
--- man/myisamchk.1	2013-12-05 08:07:26 +0000
+++ man/myisamchk.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmyisamchk\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYISAMCHK\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYISAMCHK\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -2490,7 +2490,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/myisamlog.1'
--- man/myisamlog.1	2013-12-05 08:07:26 +0000
+++ man/myisamlog.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmyisamlog\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYISAMLOG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYISAMLOG\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -228,7 +228,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/myisampack.1'
--- man/myisampack.1	2013-12-05 08:07:26 +0000
+++ man/myisampack.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmyisampack\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYISAMPACK\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYISAMPACK\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -83,6 +83,18 @@
 .\}
 After packing a table, it becomes read only\&. This is generally intended (such as when accessing packed tables on a CD)\&.
 .RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBmyisampack\fR
+does not support partitioned tables\&.
+.RE
 .PP
 Invoke
 \fBmyisampack\fR
@@ -841,7 +853,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysql-stress-test.pl.1'
--- man/mysql-stress-test.pl.1	2013-12-05 08:07:26 +0000
+++ man/mysql-stress-test.pl.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql-stress-test.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/10/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-STRESS\-TE" "1" "11/04/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-STRESS\-TE" "1" "01/10/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql-test-run.pl.1'
--- man/mysql-test-run.pl.1	2013-12-05 08:07:26 +0000
+++ man/mysql-test-run.pl.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql-test-run.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/10/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-TEST\-RUN\" "1" "11/04/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-TEST\-RUN\" "1" "01/10/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql.1'
--- man/mysql.1	2013-12-05 08:07:26 +0000
+++ man/mysql.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -3225,7 +3225,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysql.server.1'
--- man/mysql.server.1	2013-12-05 08:07:26 +0000
+++ man/mysql.server.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql.server\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\&.SERVER\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL\&.SERVER\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -170,7 +170,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysql_client_test.1'
--- man/mysql_client_test.1	2013-12-05 08:07:26 +0000
+++ man/mysql_client_test.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_client_test\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/10/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CLIENT_TEST" "1" "11/04/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL_CLIENT_TEST" "1" "01/10/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql_client_test_embedded.1'
--- man/mysql_client_test_embedded.1	2013-10-22 13:33:14 +0000
+++ man/mysql_client_test_embedded.1	2014-02-03 08:11:10 +0000
@@ -1,1 +1,1 @@
-.so man-gpl-tmp2/mysql_client_test.1
+.so man/mysql_client_test.1
 
=== modified file 'man/mysql_config.1'
--- man/mysql_config.1	2014-01-14 11:57:01 +0000
+++ man/mysql_config.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_config\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONFIG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_CONFIG\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -54,7 +54,7 @@
 \fB\-\-cflags\fR
 .sp
 Compiler flags to find include files and critical compiler flags and defines used when compiling the
-libperconaserverclient
+libmysqlclient
 library\&. The options returned are tied to the specific compiler that was used when the library was created and might clash with the settings for your own compiler\&. Use
 \fB\-\-include\fR
 for more portable options that contain only include paths\&.
@@ -198,9 +198,9 @@
 Options:
   \-\-cflags         [\-I/usr/local/mysql/include/mysql \-mcpu=pentiumpro]
   \-\-include        [\-I/usr/local/mysql/include/mysql]
-  \-\-libs           [\-L/usr/local/mysql/lib/mysql \-lperconaserverclient
+  \-\-libs           [\-L/usr/local/mysql/lib/mysql \-lmysqlclient
                     \-lpthread \-lm \-lrt \-lssl \-lcrypto \-ldl]
-  \-\-libs_r         [\-L/usr/local/mysql/lib/mysql \-lperconaserverclient_r
+  \-\-libs_r         [\-L/usr/local/mysql/lib/mysql \-lmysqlclient_r
                     \-lpthread \-lm \-lrt \-lssl \-lcrypto \-ldl]
   \-\-socket         [/tmp/mysql\&.sock]
   \-\-port           [3306]
@@ -231,7 +231,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysql_convert_table_format.1'
--- man/mysql_convert_table_format.1	2013-12-05 08:07:26 +0000
+++ man/mysql_convert_table_format.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_convert_table_format\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONVERT_TAB" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_CONVERT_TAB" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -225,7 +225,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysql_find_rows.1'
--- man/mysql_find_rows.1	2013-12-05 08:07:26 +0000
+++ man/mysql_find_rows.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_find_rows\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_FIND_ROWS\F" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_FIND_ROWS\F" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -160,7 +160,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysql_fix_extensions.1'
--- man/mysql_fix_extensions.1	2013-12-05 08:07:26 +0000
+++ man/mysql_fix_extensions.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_fix_extensions\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_FIX_EXTENSI" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_FIX_EXTENSI" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -70,7 +70,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysql_install_db.1'
--- man/mysql_install_db.1	2013-12-05 08:07:26 +0000
+++ man/mysql_install_db.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_install_db\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_INSTALL_DB\" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_INSTALL_DB\" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -285,7 +285,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysql_plugin.1'
--- man/mysql_plugin.1	2013-12-05 08:07:26 +0000
+++ man/mysql_plugin.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_plugin\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_PLUGIN\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_PLUGIN\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -370,7 +370,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysql_secure_installation.1'
--- man/mysql_secure_installation.1	2013-12-05 08:07:26 +0000
+++ man/mysql_secure_installation.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_secure_installation\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_SECURE_INST" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_SECURE_INST" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -110,7 +110,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysql_setpermission.1'
--- man/mysql_setpermission.1	2013-12-05 08:07:26 +0000
+++ man/mysql_setpermission.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_setpermission\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_SETPERMISSI" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_SETPERMISSI" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -172,7 +172,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysql_tzinfo_to_sql.1'
--- man/mysql_tzinfo_to_sql.1	2013-12-05 08:07:26 +0000
+++ man/mysql_tzinfo_to_sql.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_tzinfo_to_sql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_TZINFO_TO_S" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_TZINFO_TO_S" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -122,7 +122,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysql_upgrade.1'
--- man/mysql_upgrade.1	2013-12-05 08:07:26 +0000
+++ man/mysql_upgrade.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_upgrade\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_UPGRADE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_UPGRADE\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -456,7 +456,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysql_waitpid.1'
--- man/mysql_waitpid.1	2013-12-05 08:07:26 +0000
+++ man/mysql_waitpid.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_waitpid\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_WAITPID\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_WAITPID\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -129,7 +129,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysql_zap.1'
--- man/mysql_zap.1	2013-12-05 08:07:26 +0000
+++ man/mysql_zap.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_zap\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_ZAP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_ZAP\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -125,7 +125,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysqlaccess.1'
--- man/mysqlaccess.1	2013-12-05 08:07:26 +0000
+++ man/mysqlaccess.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqlaccess\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLACCESS\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLACCESS\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -432,7 +432,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysqladmin.1'
--- man/mysqladmin.1	2013-12-05 08:07:26 +0000
+++ man/mysqladmin.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqladmin\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLADMIN\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLADMIN\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1168,7 +1168,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysqlbinlog.1'
--- man/mysqlbinlog.1	2013-12-05 08:07:26 +0000
+++ man/mysqlbinlog.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqlbinlog\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLBINLOG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLBINLOG\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -2102,7 +2102,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysqlbug.1'
--- man/mysqlbug.1	2013-12-05 08:07:26 +0000
+++ man/mysqlbug.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqlbug\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLBUG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLBUG\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -42,7 +42,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysqlcheck.1'
--- man/mysqlcheck.1	2013-12-05 08:07:26 +0000
+++ man/mysqlcheck.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqlcheck\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLCHECK\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLCHECK\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -931,7 +931,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysqld.8'
--- man/mysqld.8	2013-12-05 08:07:26 +0000
+++ man/mysqld.8	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqld\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLD\FR" "8" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -62,7 +62,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysqld_multi.1'
--- man/mysqld_multi.1	2013-12-05 08:07:26 +0000
+++ man/mysqld_multi.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqld_multi\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD_MULTI\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLD_MULTI\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,7 +49,7 @@
 in
 my\&.cnf
 (or in the file named by the
-\fB\-\-config\-file\fR
+\fB\-\-defaults\-file\fR
 option)\&.
 \fIN\fR
 can be any positive integer\&. This number is referred to in the following discussion as the option group number, or
@@ -705,7 +705,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysqld_safe.1'
--- man/mysqld_safe.1	2013-12-05 08:07:26 +0000
+++ man/mysqld_safe.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqld_safe\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD_SAFE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLD_SAFE\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -856,7 +856,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysqldump.1'
--- man/mysqldump.1	2013-12-05 08:07:26 +0000
+++ man/mysqldump.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqldump\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLDUMP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLDUMP\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -928,13 +928,20 @@
 \fB\-\-master\-data\fR
 except that it is used to dump a replication slave server to produce a dump file that can be used to set up another server as a slave that has the same master as the dumped server\&. It causes the dump output to include a
 CHANGE MASTER TO
-statement that indicates the binary log coordinates (file name and position) of the dumped slave\*(Aqs master (rather than the coordinates of the dumped server, as is done by the
-\fB\-\-master\-data\fR
-option)\&. These are the master server coordinates from which the slave should start replicating\&. This option was added in MySQL 5\&.5\&.3\&.
+statement that indicates the binary log coordinates (file name and position) of the dumped slave\*(Aqs master\&. These are the master server coordinates from which the slave should start replicating\&.
+.sp
+\fB\-\-dump\-slave\fR
+causes the coordinates from the master to be used rather than those of the dumped server, as is done by the
+\fB\-\-master\-data\fR
+option\&. In addition, specfiying this option causes the
+\fB\-\-master\-data\fR
+option to be overridden, if used, and effectively ignored\&.
 .sp
 The option value is handled the same way as for
 \fB\-\-master\-data\fR
-and has the same effect as
+(setting no value or 1 causes a
+CHANGE MASTER TO
+statement to be written to the dump, setting 2 causes the statement to be written but encased in SQL comments) and has the same effect as
 \fB\-\-master\-data\fR
 in terms of enabling or disabling other options and in how locking is handled\&.
 .sp
@@ -948,6 +955,8 @@
 and
 \fB\-\-include\-master\-host\-port\fR
 options can also be used\&.
+.sp
+This option was added in MySQL 5\&.5\&.3\&.
 .RE
 .sp
 .RS 4
@@ -1329,7 +1338,9 @@
 .sp
 It is also possible to set up a slave by dumping an existing slave of the master\&. In MySQL 5\&.5\&.3 and later, you can create such a dump using the
 \fB\-\-dump\-slave\fR
-option\&.
+option, which overrides
+\fB\-\-master\-data\fR
+and causes it to be ignored if both options are used\&.
 .sp
 In MySQL 5\&.2\&.2 and earlier, use the following procedure on the existing slave:
 .sp
@@ -1930,7 +1941,7 @@
 MEMORY
 tables dumped while using this option may still change state\&.
 .sp
-Before MySQL 5\&.5\&.3, while a
+While a
 \fB\-\-single\-transaction\fR
 dump is in process, to ensure a valid dump file (correct table contents and binary log coordinates), no other connection should use the following statements:
 ALTER TABLE,
@@ -1941,7 +1952,7 @@
 SELECT
 that is performed by
 \fBmysqldump\fR
-to retrieve the table contents to obtain incorrect contents or fail\&. As of MySQL 5\&.5\&.3, metadata locking prevents this situation\&.
+to retrieve the table contents to obtain incorrect contents or fail\&.
 .sp
 The
 \fB\-\-single\-transaction\fR
@@ -1959,10 +1970,11 @@
 NDB
 backup and restore instead\&.
 .sp
-To dump large tables, you should combine the
+To dump large tables, combine the
 \fB\-\-single\-transaction\fR
-option with
-\fB\-\-quick\fR\&.
+option with the
+\fB\-\-quick\fR
+option\&.
 .RE
 .sp
 .RS 4
@@ -2541,7 +2553,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysqldumpslow.1'
--- man/mysqldumpslow.1	2013-12-05 08:07:26 +0000
+++ man/mysqldumpslow.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqldumpslow\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLDUMPSLOW\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLDUMPSLOW\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -323,7 +323,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysqlhotcopy.1'
--- man/mysqlhotcopy.1	2013-12-05 08:07:26 +0000
+++ man/mysqlhotcopy.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqlhotcopy\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLHOTCOPY\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLHOTCOPY\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -544,7 +544,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysqlimport.1'
--- man/mysqlimport.1	2013-12-05 08:07:26 +0000
+++ man/mysqlimport.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqlimport\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLIMPORT\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLIMPORT\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -710,7 +710,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysqlshow.1'
--- man/mysqlshow.1	2013-12-05 08:07:26 +0000
+++ man/mysqlshow.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqlshow\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLSHOW\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLSHOW\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -551,7 +551,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysqlslap.1'
--- man/mysqlslap.1	2013-12-05 08:07:26 +0000
+++ man/mysqlslap.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqlslap\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLSLAP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLSLAP\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1019,7 +1019,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/mysqltest.1'
--- man/mysqltest.1	2013-12-05 08:07:26 +0000
+++ man/mysqltest.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqltest\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/10/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQLTEST\FR" "1" "11/04/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQLTEST\FR" "1" "01/10/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysqltest_embedded.1'
--- man/mysqltest_embedded.1	2013-10-22 13:33:14 +0000
+++ man/mysqltest_embedded.1	2014-02-03 08:11:10 +0000
@@ -1,1 +1,1 @@
-.so man-gpl-tmp2/mysqltest.1
+.so man/mysqltest.1
 
=== modified file 'man/ndb-common-options.1'
--- man/ndb-common-options.1	2013-12-16 08:19:34 +0000
+++ man/ndb-common-options.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: Options Common to MySQL Cluster Programs
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "OPTIONS COMMON TO MY" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "OPTIONS COMMON TO MY" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -639,7 +639,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_blob_tool.1'
--- man/ndb_blob_tool.1	2013-12-16 08:19:34 +0000
+++ man/ndb_blob_tool.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_blob_tool\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_BLOB_TOOL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_BLOB_TOOL\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -483,7 +483,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_config.1'
--- man/ndb_config.1	2013-12-05 08:07:26 +0000
+++ man/ndb_config.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_config\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_CONFIG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_CONFIG\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1520,7 +1520,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_cpcd.1'
--- man/ndb_cpcd.1	2013-12-05 08:07:26 +0000
+++ man/ndb_cpcd.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_cpcd\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_CPCD\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_CPCD\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -39,7 +39,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_delete_all.1'
--- man/ndb_delete_all.1	2013-12-05 08:07:26 +0000
+++ man/ndb_delete_all.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_delete_all\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_DELETE_ALL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DELETE_ALL\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -162,7 +162,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_desc.1'
--- man/ndb_desc.1	2013-12-05 08:07:26 +0000
+++ man/ndb_desc.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_desc\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_DESC\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DESC\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -564,7 +564,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_drop_index.1'
--- man/ndb_drop_index.1	2013-12-05 08:07:26 +0000
+++ man/ndb_drop_index.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_drop_index\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_DROP_INDEX\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DROP_INDEX\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -154,7 +154,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_drop_table.1'
--- man/ndb_drop_table.1	2013-12-05 08:07:26 +0000
+++ man/ndb_drop_table.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_drop_table\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_DROP_TABLE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DROP_TABLE\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -95,7 +95,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_error_reporter.1'
--- man/ndb_error_reporter.1	2013-12-05 08:07:26 +0000
+++ man/ndb_error_reporter.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_error_reporter\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_ERROR_REPORTE" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_ERROR_REPORTE" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -157,7 +157,7 @@
 T{
 \fBIntroduced\fR
 T}:T{
-5\&.5\&.33\-ndb\-7\&.2\&.14
+5\&.5\&.34\-ndb\-7\&.2\&.14
 T}
 T{
 \fBCommand\-Line Format\fR
@@ -204,7 +204,7 @@
 T{
 \fBIntroduced\fR
 T}:T{
-5\&.5\&.33\-ndb\-7\&.2\&.14
+5\&.5\&.34\-ndb\-7\&.2\&.14
 T}
 T{
 \fBCommand\-Line Format\fR
@@ -298,7 +298,7 @@
 T{
 \fBIntroduced\fR
 T}:T{
-5\&.5\&.33\-ndb\-7\&.2\&.14
+5\&.5\&.34\-ndb\-7\&.2\&.14
 T}
 T{
 \fBCommand\-Line Format\fR
@@ -327,7 +327,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_index_stat.1'
--- man/ndb_index_stat.1	2013-12-16 08:19:34 +0000
+++ man/ndb_index_stat.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_index_stat\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_INDEX_STAT\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_INDEX_STAT\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -971,7 +971,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_mgm.1'
--- man/ndb_mgm.1	2013-12-05 08:07:26 +0000
+++ man/ndb_mgm.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_mgm\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_MGM\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_MGM\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -251,7 +251,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_mgmd.8'
--- man/ndb_mgmd.8	2013-12-05 08:07:26 +0000
+++ man/ndb_mgmd.8	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_mgmd\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_MGMD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_MGMD\FR" "8" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1390,7 +1390,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_print_backup_file.1'
--- man/ndb_print_backup_file.1	2013-12-05 08:07:26 +0000
+++ man/ndb_print_backup_file.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_print_backup_file\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_PRINT_BACKUP_" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_PRINT_BACKUP_" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -74,7 +74,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_print_schema_file.1'
--- man/ndb_print_schema_file.1	2013-12-05 08:07:26 +0000
+++ man/ndb_print_schema_file.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_print_schema_file\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_PRINT_SCHEMA_" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_PRINT_SCHEMA_" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -68,7 +68,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_print_sys_file.1'
--- man/ndb_print_sys_file.1	2013-12-05 08:07:26 +0000
+++ man/ndb_print_sys_file.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_print_sys_file\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_PRINT_SYS_FIL" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_PRINT_SYS_FIL" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -71,7 +71,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_restore.1'
--- man/ndb_restore.1	2013-12-05 08:07:26 +0000
+++ man/ndb_restore.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_restore\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_RESTORE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_RESTORE\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -750,6 +750,40 @@
 \fB\-A\fR) when restoring the table data\&. Attribute promotion does not occur if this option is not used; instead, the restore operation fails with an error\&.
 .RE
 .PP
+Prior to MySQL Cluster NDB 7\&.2\&.14, conversions between character data types and
+TEXT
+or
+BLOB
+were not handled correctly (Bug #17325051)\&.
+.PP
+When converting between character data types and
+TEXT
+or
+BLOB, only conversions between character types (CHAR
+and
+VARCHAR) and binary types (BINARY
+and
+VARBINARY) can be performed at the same time\&. For example, you cannot promote an
+INT
+column to
+BIGINT
+while promoting a
+VARCHAR
+column to
+TEXT
+in the same invocation of
+\fBndb_restore\fR\&.
+.PP
+When performing conversions of character or binary types to
+TEXT
+or
+BLOB
+with
+\fBndb_restore\fR, you may notice that it creates and uses one or more staging tables named
+\fItable_name\fR$ST\fInode_id\fR\&. These tables are not needed afterwards, and are normally deleted by
+\fBndb_restore\fR
+following a successful restoration\&.
+.PP
 .\" ndb_restore: lossy-conversions option
 .\" lossy-conversions option (ndb_restore)
 \fB\-\-lossy\-conversions\fR,
@@ -2074,7 +2108,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_select_all.1'
--- man/ndb_select_all.1	2013-12-05 08:07:26 +0000
+++ man/ndb_select_all.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_select_all\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_SELECT_ALL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_SELECT_ALL\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -85,6 +85,7 @@
 l l l
 l l l
 l l l
+l l l
 l l l.
 T{
 .PP
@@ -204,6 +205,15 @@
 T}
 T{
 .PP
+--gci64
+T}:T{
+Include GCI and row epoch in output
+T}:T{
+.PP
+All MySQL 5\&.5 based releases
+T}
+T{
+.PP
 --tup,
 .PP
 -t
@@ -441,7 +451,9 @@
 .\" gci option: ndb_select_all
 \fB\-\-gci\fR
 .sp
-Adds a column to the output showing the global checkpoint at which each row was last updated\&. See
+Adds a
+GCI
+column to the output showing the global checkpoint at which each row was last updated\&. See
 Section\ \&17.1, \(lqMySQL Cluster Overview\(rq, and
 Section\ \&17.5.6.2, \(lqMySQL Cluster Log Events\(rq, for more information about checkpoints\&.
 .RE
@@ -454,6 +466,23 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" ndb_select_all: gci64 option
+.\" gci64 option: ndb_select_all
+\fB\-\-gci64\fR
+.sp
+Adds a
+ROW$GCI64
+column to the output showing the global checkpoint at which each row was last updated, as well as the number of the epoch in which this update occurred\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" ndb_select_all: tupscan option
 .\" tupscan option: ndb_select_all
 \fB\-\-tupscan\fR,
@@ -574,7 +603,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_select_count.1'
--- man/ndb_select_count.1	2013-12-05 08:07:26 +0000
+++ man/ndb_select_count.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_select_count\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_SELECT_COUNT\" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_SELECT_COUNT\" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -131,7 +131,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_show_tables.1'
--- man/ndb_show_tables.1	2013-12-05 08:07:26 +0000
+++ man/ndb_show_tables.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_show_tables\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_SHOW_TABLES\F" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_SHOW_TABLES\F" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -307,7 +307,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_size.pl.1'
--- man/ndb_size.pl.1	2013-12-05 08:07:26 +0000
+++ man/ndb_size.pl.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_size.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_SIZE\&.PL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_SIZE\&.PL\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -397,7 +397,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndb_waiter.1'
--- man/ndb_waiter.1	2013-12-05 08:07:26 +0000
+++ man/ndb_waiter.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_waiter\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_WAITER\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_WAITER\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -481,7 +481,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndbd.8'
--- man/ndbd.8	2013-12-05 08:07:26 +0000
+++ man/ndbd.8	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndbd\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDBD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDBD\FR" "8" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -898,7 +898,7 @@
 T{
 \fBIntroduced\fR
 T}:T{
-5\&.5\&.27\-ndb\-7\&.2\&.9
+5\&.5\&.28\-ndb\-7\&.2\&.9
 T}
 T{
 \fBCommand\-Line Format\fR
@@ -956,7 +956,7 @@
 T{
 \fBIntroduced\fR
 T}:T{
-5\&.5\&.27\-ndb\-7\&.2\&.9
+5\&.5\&.28\-ndb\-7\&.2\&.9
 T}
 T{
 \fBCommand\-Line Format\fR
@@ -1193,7 +1193,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndbd_redo_log_reader.1'
--- man/ndbd_redo_log_reader.1	2013-12-05 08:07:26 +0000
+++ man/ndbd_redo_log_reader.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndbd_redo_log_reader\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDBD_REDO_LOG_REA" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDBD_REDO_LOG_REA" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -239,7 +239,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndbinfo_select_all.1'
--- man/ndbinfo_select_all.1	2013-12-16 08:19:34 +0000
+++ man/ndbinfo_select_all.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndbinfo_select_all\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDBINFO_SELECT_AL" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDBINFO_SELECT_AL" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -290,7 +290,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/ndbmtd.8'
--- man/ndbmtd.8	2013-12-05 08:07:26 +0000
+++ man/ndbmtd.8	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndbmtd\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDBMTD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDBMTD\FR" "8" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -203,7 +203,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/perror.1'
--- man/perror.1	2013-12-05 08:07:26 +0000
+++ man/perror.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBperror\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBPERROR\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBPERROR\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -190,7 +190,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/replace.1'
--- man/replace.1	2013-12-05 08:07:26 +0000
+++ man/replace.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBreplace\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBREPLACE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBREPLACE\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -169,7 +169,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/resolve_stack_dump.1'
--- man/resolve_stack_dump.1	2013-12-05 08:07:26 +0000
+++ man/resolve_stack_dump.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBresolve_stack_dump\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBRESOLVE_STACK_DUM" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBRESOLVE_STACK_DUM" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -129,7 +129,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'man/resolveip.1'
--- man/resolveip.1	2013-12-05 08:07:26 +0000
+++ man/resolveip.1	2014-02-03 08:11:10 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBresolveip\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 01/13/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBRESOLVEIP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBRESOLVEIP\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -108,7 +108,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
 
=== modified file 'mysql-test/CMakeLists.txt'
--- mysql-test/CMakeLists.txt	2013-11-14 02:43:34 +0000
+++ mysql-test/CMakeLists.txt	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'mysql-test/README'
--- mysql-test/README	2006-03-02 00:51:33 +0000
+++ mysql-test/README	2014-02-03 08:11:10 +0000
@@ -68,6 +68,5 @@
    that the bug is corrected in future releases.
 
 To submit your test case, put your .test file and .result file(s) into
-a tar.gz archive, add a README that explains the problem, ftp the 
-archive to ftp://support.mysql.com/pub/mysql/secret/ and send a mail
-to [e-mail]
+a tar.gz or zip archive, create a bug report at http://bugs.mysql.com/
+and attach the archive to the bug report.
 
=== modified file 'mysql-test/collections/default.weekly'
--- mysql-test/collections/default.weekly	2013-12-04 00:12:58 +0000
+++ mysql-test/collections/default.weekly	2014-02-03 08:11:10 +0000
@@ -5,3 +5,6 @@
 perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --skip-test-list=collections/disabled-weekly.list
 perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-row-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=row --skip-test-list=collections/disabled-weekly.list
 perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-mixed-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-binlog-mixed-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-weekly.list
+
+# Run innodb compression tests
+perl mysql-test-run.pl --force --debug-server --comment=innodb_compression --vardir=var-innodb-zip --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --suite=innodb_zip
 
=== modified file 'mysql-test/include/ctype_filesort2.inc'
--- mysql-test/include/ctype_filesort2.inc	2010-09-28 15:15:58 +0000
+++ mysql-test/include/ctype_filesort2.inc	2014-02-03 08:11:10 +0000
@@ -14,3 +14,12 @@
 ALTER TABLE t1 ADD KEY(a);
 SELECT HEX(a), HEX(CONVERT(a USING utf8mb4)) FROM t1 ORDER BY a;
 DROP TABLE IF EXISTS t1;
+--echo #
+--echo # BUG#16691598 - ORDER BY LOWER(COLUMN) PRODUCES
+--echo #                OUT-OF-ORDER RESULTS
+--echo #
+CREATE TABLE  t1 SELECT ('a a') as n;
+INSERT INTO t1 VALUES('a b');
+SELECT * FROM t1 ORDER BY LOWER(n) ASC;
+SELECT * FROM t1 ORDER BY LOWER(n) DESC;
+DROP TABLE t1;
 
=== modified file 'mysql-test/include/mtr_check.sql'
--- mysql-test/include/mtr_check.sql	2013-12-05 08:07:26 +0000
+++ mysql-test/include/mtr_check.sql	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
--- Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -52,6 +52,16 @@
       WHERE table_schema='mysql' AND table_name != 'ndb_apply_status'
         ORDER BY columns_in_mysql;
 
+  -- Dump all events, there should be none
+  SELECT * FROM INFORMATION_SCHEMA.EVENTS;
+  -- Dump all triggers	 except mtr internals, there should be none
+  SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
+         WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert');
+  -- Dump all created procedures, there should be none
+  SELECT * FROM INFORMATION_SCHEMA.ROUTINES;
+
+  SHOW STATUS LIKE 'slave_open_temp_tables';
+
   -- Checksum system tables to make sure they have been properly
   -- restored after test
   checksum table
@@ -72,8 +82,6 @@
     mysql.time_zone_transition_type,
     mysql.user;
 
- show status like 'slave_open_temp_tables';
-
 END||
 
 --
 
=== modified file 'mysql-test/lib/My/SafeProcess/safe_process.cc'
--- mysql-test/lib/My/SafeProcess/safe_process.cc	2013-06-27 15:35:20 +0000
+++ mysql-test/lib/My/SafeProcess/safe_process.cc	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysql-test/lib/My/SysInfo.pm'
--- mysql-test/lib/My/SysInfo.pm	2013-04-16 10:56:45 +0000
+++ mysql-test/lib/My/SysInfo.pm	2014-02-03 08:11:10 +0000
@@ -1,6 +1,5 @@
 # -*- cperl -*-
-# Copyright (c) 2013 MySQL AB, 2008 Sun Microsystems, Inc.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'mysql-test/mysql-test-run.pl'
--- mysql-test/mysql-test-run.pl	2013-12-05 08:07:26 +0000
+++ mysql-test/mysql-test-run.pl	2014-02-03 08:11:10 +0000
@@ -164,7 +164,7 @@
 
 # If you add a new suite, please check TEST_DIRS in Makefile.am.
 #
-my $DEFAULT_SUITES= "main,sys_vars,binlog,federated,rpl,innodb,perfschema";
+my $DEFAULT_SUITES= "main,sys_vars,binlog,federated,rpl,innodb,innodb_zip,perfschema";
 my $opt_suites;
 
 our $opt_verbose= 0;  # Verbose output, enable with --verbose
 
=== modified file 'mysql-test/r/ctype_utf16.result'
--- mysql-test/r/ctype_utf16.result	2011-10-12 13:41:25 +0000
+++ mysql-test/r/ctype_utf16.result	2014-02-03 08:11:10 +0000
@@ -636,6 +636,21 @@
 D800DF84	F0908E84
 DBC0DC00	F4808080
 DROP TABLE IF EXISTS t1;
+#
+# BUG#16691598 - ORDER BY LOWER(COLUMN) PRODUCES
+#                OUT-OF-ORDER RESULTS
+#
+CREATE TABLE  t1 SELECT ('a a') as n;
+INSERT INTO t1 VALUES('a b');
+SELECT * FROM t1 ORDER BY LOWER(n) ASC;
+n
+a a
+a b
+SELECT * FROM t1 ORDER BY LOWER(n) DESC;
+n
+a b
+a a
+DROP TABLE t1;
 select @@collation_connection;
 @@collation_connection
 utf16_bin
 
=== modified file 'mysql-test/r/ctype_utf32.result'
--- mysql-test/r/ctype_utf32.result	2011-10-12 13:41:25 +0000
+++ mysql-test/r/ctype_utf32.result	2014-02-03 08:11:10 +0000
@@ -635,6 +635,21 @@
 00010384	F0908E84
 00100000	F4808080
 DROP TABLE IF EXISTS t1;
+#
+# BUG#16691598 - ORDER BY LOWER(COLUMN) PRODUCES
+#                OUT-OF-ORDER RESULTS
+#
+CREATE TABLE  t1 SELECT ('a a') as n;
+INSERT INTO t1 VALUES('a b');
+SELECT * FROM t1 ORDER BY LOWER(n) ASC;
+n
+a a
+a b
+SELECT * FROM t1 ORDER BY LOWER(n) DESC;
+n
+a b
+a a
+DROP TABLE t1;
 select @@collation_connection;
 @@collation_connection
 utf32_bin
 
=== modified file 'mysql-test/r/ctype_utf8mb4.result'
--- mysql-test/r/ctype_utf8mb4.result	2013-01-31 01:36:30 +0000
+++ mysql-test/r/ctype_utf8mb4.result	2014-02-03 08:11:10 +0000
@@ -1012,6 +1012,21 @@
 F0908E84	F0908E84
 F4808080	F4808080
 DROP TABLE IF EXISTS t1;
+#
+# BUG#16691598 - ORDER BY LOWER(COLUMN) PRODUCES
+#                OUT-OF-ORDER RESULTS
+#
+CREATE TABLE  t1 SELECT ('a a') as n;
+INSERT INTO t1 VALUES('a b');
+SELECT * FROM t1 ORDER BY LOWER(n) ASC;
+n
+a a
+a b
+SELECT * FROM t1 ORDER BY LOWER(n) DESC;
+n
+a b
+a a
+DROP TABLE t1;
 select @@collation_connection;
 @@collation_connection
 utf8mb4_bin
 
=== modified file 'mysql-test/r/distinct.result'
--- mysql-test/r/distinct.result	2011-05-11 11:11:57 +0000
+++ mysql-test/r/distinct.result	2014-02-03 08:11:10 +0000
@@ -804,4 +804,44 @@
 11112222
 33334444
 DROP TABLE t1;
+#
+# Bug#16539979 BASIC SELECT COUNT(DISTINCT ID) IS BROKEN.
+# Bug#17867117 ERROR RESULT WHEN "COUNT + DISTINCT + CASE WHEN" NEED MERGE_WALK 
+#
+SET @tmp_table_size_save= @@tmp_table_size;
+SET @@tmp_table_size= 1024;
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8);
+INSERT INTO t1 SELECT a+8 FROM t1;
+INSERT INTO t1 SELECT a+16 FROM t1;
+INSERT INTO t1 SELECT a+32 FROM t1;
+INSERT INTO t1 SELECT a+64 FROM t1;
+INSERT INTO t1 VALUE(NULL);
+SELECT COUNT(DISTINCT a) FROM t1;
+COUNT(DISTINCT a)
+128
+SELECT COUNT(DISTINCT (a+0)) FROM t1;
+COUNT(DISTINCT (a+0))
+128
+DROP TABLE t1;
+create table tb(
+id int auto_increment primary key,
+v varchar(32))
+engine=myisam charset=gbk;
+insert into tb(v) values("aaa");
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+update tb set v=concat(v, id);
+select count(distinct case when id<=64 then id end) from tb;
+count(distinct case when id<=64 then id end)
+64
+select count(distinct case when id<=63 then id end) from tb;
+count(distinct case when id<=63 then id end)
+63
+drop table tb;
+SET @@tmp_table_size= @tmp_table_size_save;
 End of 5.5 tests
 
=== modified file 'mysql-test/r/events_trans.result'
--- mysql-test/r/events_trans.result	2010-08-13 08:02:37 +0000
+++ mysql-test/r/events_trans.result	2014-02-03 08:11:10 +0000
@@ -135,3 +135,4 @@
 a
 ROLLBACK WORK TO SAVEPOINT A;
 DROP TABLE t1, t2;
+DROP EVENT e1;
 
=== modified file 'mysql-test/r/gis.result'
--- mysql-test/r/gis.result	2012-03-05 18:36:56 +0000
+++ mysql-test/r/gis.result	2014-02-03 08:11:10 +0000
@@ -1113,4 +1113,25 @@
 (SELECT 1 FROM g1 WHERE a = geomfromtext('') OR a) ;
 1
 DROP TABLE g1;
+#
+# Bug#16451878 GEOMETRY QUERY CRASHES SERVER
+#
+# should not crash
+SELECT ASTEXT(0x0100000000030000000100000000000010);
+ASTEXT(0x0100000000030000000100000000000010)
+NULL
+#should not crash
+SELECT ENVELOPE(0x0100000000030000000100000000000010);
+ENVELOPE(0x0100000000030000000100000000000010)
+NULL
+#should not crash
+SELECT
+GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffff0000, 1);
+GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffff0000, 1)
+NULL
+#should not crash
+SELECT
+GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffffff0f, 1);
+GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffffff0f, 1)
+NULL
 End of 5.5 tests
 
=== added file 'mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result'
--- mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result	2014-02-03 08:11:10 +0000
@@ -0,0 +1,39 @@
+#
+# Bug#69122 - INNODB DOESN'T REDO-LOG INSERT BUFFER MERGE
+#             OPERATION IF IT IS DONE IN-PLACE
+#
+SET GLOBAL innodb_change_buffering_debug = 1;
+CREATE TABLE t1(
+a INT AUTO_INCREMENT PRIMARY KEY,
+b CHAR(1),
+c INT,
+INDEX(b))
+ENGINE=InnoDB;
+INSERT INTO t1 VALUES(0,'x',1);
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+BEGIN;
+SELECT b FROM t1 LIMIT 3;
+b
+x
+x
+x
+BEGIN;
+DELETE FROM t1 WHERE a=1;
+INSERT INTO t1 VALUES(1,'X',1);
+SET DEBUG='+d,crash_after_log_ibuf_upd_inplace';
+SELECT b FROM t1 LIMIT 3;
+ERROR HY000: Lost connection to MySQL server during query
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+DROP TABLE t1;
 
=== added file 'mysql-test/suite/innodb/t/innodb-change-buffer-recovery-master.opt'
--- mysql-test/suite/innodb/t/innodb-change-buffer-recovery-master.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/t/innodb-change-buffer-recovery-master.opt	2014-02-03 08:11:10 +0000
@@ -0,0 +1,1 @@
+--log-error=$MYSQLTEST_VARDIR/tmp/my_restart.err
 
=== added file 'mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test'
--- mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test	2014-02-03 08:11:10 +0000
@@ -0,0 +1,70 @@
+--echo #
+--echo # Bug#69122 - INNODB DOESN'T REDO-LOG INSERT BUFFER MERGE
+--echo #             OPERATION IF IT IS DONE IN-PLACE
+--echo #
+--source include/have_innodb.inc
+# innodb_change_buffering_debug option is debug only
+--source include/have_debug.inc
+# Embedded server does not support crashing
+--source include/not_embedded.inc
+# DBUG_SUICIDE() hangs under valgrind
+--source include/not_valgrind.inc
+
+# The flag innodb_change_buffering_debug is only available in debug builds.
+# It instructs InnoDB to try to evict pages from the buffer pool when
+# change buffering is possible, so that the change buffer will be used
+# whenever possible.
+SET GLOBAL innodb_change_buffering_debug = 1;
+let SEARCH_FILE = $MYSQLTEST_VARDIR/tmp/my_restart.err;
+
+CREATE TABLE t1(
+	a INT AUTO_INCREMENT PRIMARY KEY,
+	b CHAR(1),
+	c INT,
+	INDEX(b))
+ENGINE=InnoDB;
+
+# Create enough rows for the table, so that the change buffer will be
+# used for modifying the secondary index page. There must be multiple
+# index pages, because changes to the root page are never buffered.
+INSERT INTO t1 VALUES(0,'x',1);
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+
+BEGIN;
+SELECT b FROM t1 LIMIT 3;
+
+connect (con1,localhost,root,,);
+connection con1;
+BEGIN;
+DELETE FROM t1 WHERE a=1;
+# This should be buffered, if innodb_change_buffering_debug = 1 is in effect.
+INSERT INTO t1 VALUES(1,'X',1);
+
+SET DEBUG='+d,crash_after_log_ibuf_upd_inplace';
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--error 2013
+# This should force a change buffer merge
+SELECT b FROM t1 LIMIT 3;
+
+let SEARCH_PATTERN=Wrote log record for ibuf update in place operation;
+--source include/search_pattern_in_file.inc
+
+# Write file to make mysql-test-run.pl start up the server again
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+CHECK TABLE t1;
+
+# Cleanup
+DROP TABLE t1;
 
=== added directory 'mysql-test/suite/innodb_zip'
=== added directory 'mysql-test/suite/innodb_zip/r'
=== renamed file 'mysql-test/suite/innodb/r/innodb-create-options.result' => 'mysql-test/suite/innodb_zip/r/innodb-create-options.result'
=== renamed file 'mysql-test/suite/innodb/r/innodb-zip.result' => 'mysql-test/suite/innodb_zip/r/innodb-zip.result'
=== renamed file 'mysql-test/suite/innodb/r/innodb_bug36169.result' => 'mysql-test/suite/innodb_zip/r/innodb_bug36169.result'
=== renamed file 'mysql-test/suite/innodb/r/innodb_bug36172.result' => 'mysql-test/suite/innodb_zip/r/innodb_bug36172.result'
=== renamed file 'mysql-test/suite/innodb/r/innodb_bug52745.result' => 'mysql-test/suite/innodb_zip/r/innodb_bug52745.result'
=== renamed file 'mysql-test/suite/innodb/r/innodb_bug53591.result' => 'mysql-test/suite/innodb_zip/r/innodb_bug53591.result'
=== renamed file 'mysql-test/suite/innodb/r/innodb_bug56680.result' => 'mysql-test/suite/innodb_zip/r/innodb_bug56680.result'
=== renamed file 'mysql-test/suite/innodb/r/innodb_cmp_drop_table.result' => 'mysql-test/suite/innodb_zip/r/innodb_cmp_drop_table.result'
=== renamed file 'mysql-test/suite/innodb/r/innodb_index_large_prefix.result' => 'mysql-test/suite/innodb_zip/r/innodb_index_large_prefix.result'
=== renamed file 'mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result' => 'mysql-test/suite/innodb_zip/r/innodb_prefix_index_liftedlimit.result'
=== added directory 'mysql-test/suite/innodb_zip/t'
=== renamed file 'mysql-test/suite/innodb/t/innodb-create-options.test' => 'mysql-test/suite/innodb_zip/t/innodb-create-options.test'
=== renamed file 'mysql-test/suite/innodb/t/innodb-zip.test' => 'mysql-test/suite/innodb_zip/t/innodb-zip.test'
=== renamed file 'mysql-test/suite/innodb/t/innodb_bug36169.test' => 'mysql-test/suite/innodb_zip/t/innodb_bug36169.test'
=== renamed file 'mysql-test/suite/innodb/t/innodb_bug36172.test' => 'mysql-test/suite/innodb_zip/t/innodb_bug36172.test'
=== renamed file 'mysql-test/suite/innodb/t/innodb_bug52745.test' => 'mysql-test/suite/innodb_zip/t/innodb_bug52745.test'
=== renamed file 'mysql-test/suite/innodb/t/innodb_bug53591.test' => 'mysql-test/suite/innodb_zip/t/innodb_bug53591.test'
=== renamed file 'mysql-test/suite/innodb/t/innodb_bug56680.test' => 'mysql-test/suite/innodb_zip/t/innodb_bug56680.test'
=== renamed file 'mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt' => 'mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table-master.opt'
=== renamed file 'mysql-test/suite/innodb/t/innodb_cmp_drop_table.test' => 'mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table.test'
=== renamed file 'mysql-test/suite/innodb/t/innodb_index_large_prefix.test' => 'mysql-test/suite/innodb_zip/t/innodb_index_large_prefix.test'
=== renamed file 'mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test' => 'mysql-test/suite/innodb_zip/t/innodb_prefix_index_liftedlimit.test'
=== modified file 'mysql-test/t/distinct.test'
--- mysql-test/t/distinct.test	2011-05-11 11:11:57 +0000
+++ mysql-test/t/distinct.test	2014-02-03 08:11:10 +0000
@@ -625,5 +625,42 @@
 SELECT DISTINCT CONCAT(a,b) AS c FROM t1 ORDER BY 1;
 DROP TABLE t1;
 
+--echo #
+--echo # Bug#16539979 BASIC SELECT COUNT(DISTINCT ID) IS BROKEN.
+--echo # Bug#17867117 ERROR RESULT WHEN "COUNT + DISTINCT + CASE WHEN" NEED MERGE_WALK 
+--echo #
+
+SET @tmp_table_size_save= @@tmp_table_size;
+SET @@tmp_table_size= 1024;
+
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8);
+INSERT INTO t1 SELECT a+8 FROM t1;
+INSERT INTO t1 SELECT a+16 FROM t1;
+INSERT INTO t1 SELECT a+32 FROM t1;
+INSERT INTO t1 SELECT a+64 FROM t1;
+INSERT INTO t1 VALUE(NULL);
+SELECT COUNT(DISTINCT a) FROM t1;
+SELECT COUNT(DISTINCT (a+0)) FROM t1;
+DROP TABLE t1;
+
+create table tb(
+id int auto_increment primary key,
+v varchar(32))
+engine=myisam charset=gbk;
+insert into tb(v) values("aaa");
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+
+update tb set v=concat(v, id);
+select count(distinct case when id<=64 then id end) from tb;
+select count(distinct case when id<=63 then id end) from tb;
+drop table tb;
+
+SET @@tmp_table_size= @tmp_table_size_save;
 
 --echo End of 5.5 tests
 
=== modified file 'mysql-test/t/events_trans.test'
--- mysql-test/t/events_trans.test	2010-08-13 08:02:37 +0000
+++ mysql-test/t/events_trans.test	2014-02-03 08:11:10 +0000
@@ -146,3 +146,4 @@
 ROLLBACK WORK TO SAVEPOINT A;
 
 DROP TABLE t1, t2;
+DROP EVENT e1;
 
=== modified file 'mysql-test/t/gis.test'
--- mysql-test/t/gis.test	2012-03-06 11:17:06 +0000
+++ mysql-test/t/gis.test	2014-02-03 08:11:10 +0000
@@ -868,4 +868,22 @@
 
 DROP TABLE g1;
 
+--echo #
+--echo # Bug#16451878 GEOMETRY QUERY CRASHES SERVER
+--echo #
+
+--echo # should not crash
+SELECT ASTEXT(0x0100000000030000000100000000000010);
+
+--echo #should not crash
+SELECT ENVELOPE(0x0100000000030000000100000000000010);
+
+--echo #should not crash
+SELECT
+  GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffff0000, 1);
+
+--echo #should not crash
+SELECT
+  GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffffff0f, 1);
+
 --echo End of 5.5 tests
 
=== modified file 'mysys/md5.c'
--- mysys/md5.c	2013-10-28 10:15:55 +0000
+++ mysys/md5.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/mf_keycache.c'
--- mysys/mf_keycache.c	2013-01-15 10:00:26 +0000
+++ mysys/mf_keycache.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/mf_qsort.c'
--- mysys/mf_qsort.c	2013-03-19 14:53:48 +0000
+++ mysys/mf_qsort.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000-2002, 2007 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/mf_radix.c'
--- mysys/mf_radix.c	2013-03-19 14:53:48 +0000
+++ mysys/mf_radix.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2007 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/mf_same.c'
--- mysys/mf_same.c	2013-03-19 14:53:48 +0000
+++ mysys/mf_same.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2001, 2007 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/mf_soundex.c'
--- mysys/mf_soundex.c	2013-03-19 14:53:48 +0000
+++ mysys/mf_soundex.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2002, 2004, 2007 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/mf_tempdir.c'
--- mysys/mf_tempdir.c	2011-06-30 15:46:53 +0000
+++ mysys/mf_tempdir.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@
       pathlist=getenv("TMP");
 #endif
     if (!pathlist || !pathlist[0])
-      pathlist=(char*) P_tmpdir;
+      pathlist= DEFAULT_TMPDIR;
   }
   do
   {
 
=== modified file 'mysys/mf_tempfile.c'
--- mysys/mf_tempfile.c	2013-03-19 12:36:34 +0000
+++ mysys/mf_tempfile.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -111,7 +111,7 @@
 				    sizeof(prefix_buff)-7),"XXXXXX") -
 		     prefix_buff);
     if (!dir && ! (dir =getenv("TMPDIR")))
-      dir=P_tmpdir;
+      dir= DEFAULT_TMPDIR;
     if (strlen(dir)+ pfx_len > FN_REFLEN-2)
     {
       errno=my_errno= ENAMETOOLONG;
 
=== modified file 'mysys/mf_wcomp.c'
--- mysys/mf_wcomp.c	2013-03-19 14:53:48 +0000
+++ mysys/mf_wcomp.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2003, 2004 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/mulalloc.c'
--- mysys/mulalloc.c	2013-03-19 14:53:48 +0000
+++ mysys/mulalloc.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2002, 2003, 2007 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/my_access.c'
--- mysys/my_access.c	2013-06-27 15:35:20 +0000
+++ mysys/my_access.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/my_aes.c'
--- mysys/my_aes.c	2013-03-19 14:53:48 +0000
+++ mysys/my_aes.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, 2006 MySQL AB
+   Use is subject to license terms
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/my_conio.c'
--- mysys/my_conio.c	2013-03-19 14:53:48 +0000
+++ mysys/my_conio.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2005, 2007 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/my_crc32.c'
--- mysys/my_crc32.c	2013-03-19 14:53:48 +0000
+++ mysys/my_crc32.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2004 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/my_div.c'
--- mysys/my_div.c	2013-03-19 14:53:48 +0000
+++ mysys/my_div.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2002, 2004, 2007 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/my_error.c'
--- mysys/my_error.c	2013-02-26 05:35:17 +0000
+++ mysys/my_error.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/my_fopen.c'
--- mysys/my_fopen.c	2013-03-19 14:53:48 +0000
+++ mysys/my_fopen.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/my_getpagesize.c'
--- mysys/my_getpagesize.c	2013-03-19 14:53:48 +0000
+++ mysys/my_getpagesize.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000-2003, 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/my_libwrap.c'
--- mysys/my_libwrap.c	2013-03-19 14:53:48 +0000
+++ mysys/my_libwrap.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/my_lockmem.c'
--- mysys/my_lockmem.c	2013-03-19 12:36:34 +0000
+++ mysys/my_lockmem.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/my_malloc.c'
--- mysys/my_malloc.c	2013-01-15 10:00:26 +0000
+++ mysys/my_malloc.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/my_memmem.c'
--- mysys/my_memmem.c	2013-03-19 14:53:48 +0000
+++ mysys/my_memmem.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2006, 2007 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/my_mkdir.c'
--- mysys/my_mkdir.c	2013-03-19 14:53:48 +0000
+++ mysys/my_mkdir.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2001, 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/my_once.c'
--- mysys/my_once.c	2013-03-19 12:36:34 +0000
+++ mysys/my_once.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/my_symlink2.c'
--- mysys/my_symlink2.c	2013-03-19 14:53:48 +0000
+++ mysys/my_symlink2.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2001, 2003, 2005-2007 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/my_wincond.c'
--- mysys/my_wincond.c	2011-06-30 15:46:53 +0000
+++ mysys/my_wincond.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -305,7 +305,7 @@
 
 
 int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-  struct timespec *abstime)
+  const struct timespec *abstime)
 {
   if (have_native_conditions)
   {
 
=== modified file 'mysys/my_winthread.c'
--- mysys/my_winthread.c	2013-07-24 10:14:41 +0000
+++ mysys/my_winthread.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/test_dir.c'
--- mysys/test_dir.c	2013-03-19 14:53:48 +0000
+++ mysys/test_dir.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/test_xml.c'
--- mysys/test_xml.c	2013-03-19 14:53:48 +0000
+++ mysys/test_xml.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2002 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'mysys/thr_alarm.c'
--- mysys/thr_alarm.c	2013-02-26 05:35:17 +0000
+++ mysys/thr_alarm.c	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'packaging/WiX/CPackWixConfig.cmake'
--- packaging/WiX/CPackWixConfig.cmake	2013-05-29 14:39:45 +0000
+++ packaging/WiX/CPackWixConfig.cmake	2014-02-03 08:11:10 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'packaging/WiX/custom_ui.wxs'
--- packaging/WiX/custom_ui.wxs	2013-01-02 05:18:27 +0000
+++ packaging/WiX/custom_ui.wxs	2014-02-03 08:11:10 +0000
@@ -2,7 +2,7 @@
          xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
 <!--
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
       <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" Disabled="yes" />
       <Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" />
       <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />
-      <Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved." />
+      <Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved." />
       <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />
       <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
     </Dialog>
 
=== modified file 'packaging/WiX/mysql_server.wxs.in'
--- packaging/WiX/mysql_server.wxs.in	2013-09-30 07:11:22 +0000
+++ packaging/WiX/mysql_server.wxs.in	2014-02-03 08:11:10 +0000
@@ -2,7 +2,7 @@
       xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
 <!--
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== added directory 'packaging/rpm-oel'
=== added file 'packaging/rpm-oel/CMakeLists.txt'
--- packaging/rpm-oel/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ packaging/rpm-oel/CMakeLists.txt	2014-02-03 08:11:10 +0000
@@ -0,0 +1,36 @@
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+
+IF(UNIX)
+  SET(prefix ${CMAKE_INSTALL_PREFIX})
+
+  SET(SPECFILENAME "mysql.spec")
+  IF("${VERSION}" MATCHES "-ndb-")
+    STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}")
+    SET(SPECFILENAME "mysql-cluster-${NDBVERSION}.spec")
+  ENDIF()
+
+  # Left in current directory, to be taken during build
+  CONFIGURE_FILE(mysql.spec.in ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY)
+
+  FOREACH(fedfile my.cnf my_config.h mysql_config.sh
+          mysqld.service mysql-systemd-start mysql.conf
+          filter-requires.sh filter-provides.sh
+          mysql-embedded-check.c mysql.init)
+    CONFIGURE_FILE(${fedfile} ${CMAKE_CURRENT_BINARY_DIR}/${fedfile} COPYONLY)
+  ENDFOREACH()
+ENDIF()
+
 
=== added file 'packaging/rpm-oel/filter-provides.sh'
--- packaging/rpm-oel/filter-provides.sh	1970-01-01 00:00:00 +0000
+++ packaging/rpm-oel/filter-provides.sh	2014-02-03 08:11:10 +0000
@@ -0,0 +1,6 @@
+#! /bin/bash
+#
+
+/usr/lib/rpm/perl.prov $* |
+sed -e '/perl(hostnames)/d' -e '/perl(lib::mtr.*/d' -e '/perl(lib::v1.*/d' -e '/perl(mtr_.*/d' -e '/perl(My::.*/d'
+
 
=== added file 'packaging/rpm-oel/filter-requires.sh'
--- packaging/rpm-oel/filter-requires.sh	1970-01-01 00:00:00 +0000
+++ packaging/rpm-oel/filter-requires.sh	2014-02-03 08:11:10 +0000
@@ -0,0 +1,6 @@
+#! /bin/bash
+#
+
+/usr/lib/rpm/perl.req $* |
+sed -e '/perl(hostnames)/d' -e '/perl(lib::mtr.*/d' -e '/perl(lib::v1.*/d' -e '/perl(mtr_.*/d' -e '/perl(My::.*/d'
+
 
=== added file 'packaging/rpm-oel/my.cnf'
--- packaging/rpm-oel/my.cnf	1970-01-01 00:00:00 +0000
+++ packaging/rpm-oel/my.cnf	2014-02-03 08:11:10 +0000
@@ -0,0 +1,31 @@
+# For advice on how to change settings please see
+# http://dev.mysql.com/doc/refman/5.5/en/server-configuration-defaults.html
+
+[mysqld]
+#
+# Remove leading # and set to the amount of RAM for the most important data
+# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%.
+# innodb_buffer_pool_size = 128M
+#
+# Remove leading # to turn on a very important data integrity option: logging
+# changes to the binary log between backups.
+# log_bin
+#
+# Remove leading # to set options mainly useful for reporting servers.
+# The server defaults are faster for transactions and fast SELECTs.
+# Adjust sizes as needed, experiment to find the optimal values.
+# join_buffer_size = 128M
+# sort_buffer_size = 2M
+# read_rnd_buffer_size = 2M
+datadir=/var/lib/mysql
+socket=/var/lib/mysql/mysql.sock
+
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+
+# Recommended in standard MySQL setup
+#sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES 
+
+[mysqld_safe]
+log-error=/var/log/mysqld.log
+pid-file=/var/run/mysqld/mysqld.pid
 
=== added file 'packaging/rpm-oel/my_config.h'
--- packaging/rpm-oel/my_config.h	1970-01-01 00:00:00 +0000
+++ packaging/rpm-oel/my_config.h	2014-02-03 08:11:10 +0000
@@ -0,0 +1,30 @@
+/*
+ *  Fedora supports multi arch: having 32 and 64 versions of MySQL
+ *  installed at the same time. my_config.h will differ due arch
+ *  dependent defs creating a file conflict. We move arch specific
+ *  headers to arch specific file names and include the correct arch
+ *  specific file by installing this generic file.
+ *
+ */
+
+#if defined(__i386__)
+#include "my_config_i386.h"
+#elif defined(__ia64__)
+#include "my_config_ia64.h"
+#elif defined(__powerpc__)
+#include "my_config_ppc.h"
+#elif defined(__powerpc64__)
+#include "my_config_ppc64.h"
+#elif defined(__s390x__)
+#include "my_config_s390x.h"
+#elif defined(__s390__)
+#include "my_config_s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "my_config_sparc64.h"
+#elif defined(__sparc__)
+#include "my_config_sparc.h"
+#elif defined(__x86_64__)
+#include "my_config_x86_64.h"
+#else
+#error "This MySQL devel package does not work your architecture?"
+#endif
 
=== added file 'packaging/rpm-oel/mysql-embedded-check.c'
--- packaging/rpm-oel/mysql-embedded-check.c	1970-01-01 00:00:00 +0000
+++ packaging/rpm-oel/mysql-embedded-check.c	2014-02-03 08:11:10 +0000
@@ -0,0 +1,26 @@
+/* simple test program to see if we can link the embedded server library */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+
+#include "mysql.h"
+
+MYSQL *mysql;
+
+static char *server_options[] = \
+       { "mysql_test", "--defaults-file=my.cnf", NULL };
+int num_elements = (sizeof(server_options) / sizeof(char *)) - 1;
+
+static char *server_groups[] = { "libmysqld_server", 
+                                 "libmysqld_client", NULL };
+
+int main(int argc, char **argv)
+{
+   mysql_library_init(num_elements, server_options, server_groups);
+   mysql = mysql_init(NULL);
+   mysql_close(mysql);
+   mysql_library_end();
+
+   return 0;
+}
 
=== added file 'packaging/rpm-oel/mysql-systemd-start'
--- packaging/rpm-oel/mysql-systemd-start	1970-01-01 00:00:00 +0000
+++ packaging/rpm-oel/mysql-systemd-start	2014-02-03 08:11:10 +0000
@@ -0,0 +1,52 @@
+#! /bin/bash
+#
+# Scripts to run by MySQL systemd service
+# 
+# Needed argument: pre | post
+# 
+# pre mode  :  try to run mysql_install_db and fix perms and SELinux contexts
+# post mode :  ping server until answer is received
+# 
+
+install_db () {    
+    # Note: something different than datadir=/var/lib/mysql requires SELinux policy changes (in enforcing mode)
+    datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p')
+    
+    # Restore log, dir, perms and SELinux contexts
+    [ -d "$datadir" ] || install -d -m 0755 -omysql -gmysql "$datadir" || exit 1
+    log=/var/log/mysqld.log
+    [ -e $log ] || touch $log
+    chmod 0640 $log
+    chown mysql:mysql $log || exit 1
+    if [ -x /usr/sbin/restorecon ]; then
+        /usr/sbin/restorecon "$datadir"
+        /usr/sbin/restorecon $log
+    fi
+
+    # If special mysql dir is in place, skip db install 
+    [ -d "$datadir/mysql" ] && exit 0
+
+    # Create initial db
+    /usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql
+    exit 0
+}
+
+pinger () {
+    # Wait for ping to answer to signal startup completed,
+    # might take a while in case of e.g. crash recovery
+    # MySQL systemd service will timeout script if no answer
+    while /bin/true ; do
+        sleep 1
+        mysqladmin ping >/dev/null 2>&1 && break
+    done
+    exit 0
+}
+
+# main
+case $1 in
+    "pre") install_db ;;
+    "post") pinger ;;
+esac
+
+exit 0
+
 
=== added file 'packaging/rpm-oel/mysql.conf'
--- packaging/rpm-oel/mysql.conf	1970-01-01 00:00:00 +0000
+++ packaging/rpm-oel/mysql.conf	2014-02-03 08:11:10 +0000
@@ -0,0 +1,1 @@
+d /var/run/mysqld 0755 mysql mysql -
 
=== added file 'packaging/rpm-oel/mysql.init'
--- packaging/rpm-oel/mysql.init	1970-01-01 00:00:00 +0000
+++ packaging/rpm-oel/mysql.init	2014-02-03 08:11:10 +0000
@@ -0,0 +1,209 @@
+#!/bin/sh
+#
+# mysqld	This shell script takes care of starting and stopping
+#		the MySQL subsystem (mysqld).
+#
+# chkconfig: - 64 36
+# description:	MySQL database server.
+# processname: mysqld
+# config: /etc/my.cnf
+# pidfile: /var/run/mysqld/mysqld.pid
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# Source networking configuration.
+. /etc/sysconfig/network
+
+
+exec="/usr/bin/mysqld_safe"
+prog="mysqld"
+
+# Set timeouts here so they can be overridden from /etc/sysconfig/mysqld
+STARTTIMEOUT=120
+STOPTIMEOUT=60
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
+
+
+# extract value of a MySQL option from config files
+# Usage: get_mysql_option SECTION VARNAME DEFAULT
+# result is returned in $result
+# We use my_print_defaults which prints all options from multiple files,
+# with the more specific ones later; hence take the last match.
+get_mysql_option(){
+	result=`/usr/bin/my_print_defaults "$1" | sed -n "s/^--$2=//p" | tail -n 1`
+	if [ -z "$result" ]; then
+	    # not found, use default
+	    result="$3"
+	fi
+}
+
+get_mysql_option mysqld datadir "/var/lib/mysql"
+datadir="$result"
+get_mysql_option mysqld socket "$datadir/mysql.sock"
+socketfile="$result"
+get_mysql_option mysqld_safe log-error "/var/log/mysqld.log"
+errlogfile="$result"
+get_mysql_option mysqld_safe pid-file "/var/run/mysqld/mysqld.pid"
+mypidfile="$result"
+
+
+start(){
+    [ -x $exec ] || exit 5
+    # check to see if it's already running
+    RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
+    if [ $? = 0 ]; then
+	# already running, do nothing
+	action $"Starting $prog: " /bin/true
+	ret=0
+    elif echo "$RESPONSE" | grep -q "Access denied for user"
+    then
+	# already running, do nothing
+	action $"Starting $prog: " /bin/true
+	ret=0
+    else
+    	# prepare for start
+	touch "$errlogfile"
+	chown mysql:mysql "$errlogfile" 
+	chmod 0640 "$errlogfile"
+	[ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile"
+	if [ ! -d "$datadir/mysql" ] ; then
+	    # First, make sure $datadir is there with correct permissions
+	    if [ ! -e "$datadir" -a ! -h "$datadir" ]
+	    then
+		mkdir -p "$datadir" || exit 1
+	    fi
+	    chown mysql:mysql "$datadir"
+	    chmod 0755 "$datadir"
+	    [ -x /sbin/restorecon ] && /sbin/restorecon "$datadir"
+	    # Now create the database
+	    action $"Initializing MySQL database: " /usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql
+	    ret=$?
+	    chown -R mysql:mysql "$datadir"
+	    if [ $ret -ne 0 ] ; then
+		return $ret
+	    fi
+	fi
+	chown mysql:mysql "$datadir"
+	chmod 0755 "$datadir"
+	# Pass all the options determined above, to ensure consistent behavior.
+	# In many cases mysqld_safe would arrive at the same conclusions anyway
+	# but we need to be sure.  (An exception is that we don't force the
+	# log-error setting, since this script doesn't really depend on that,
+	# and some users might prefer to configure logging to syslog.)
+	# Note: set --basedir to prevent probes that might trigger SELinux
+	# alarms, per bug #547485
+	$exec   --datadir="$datadir" --socket="$socketfile" \
+		--pid-file="$mypidfile" \
+		--basedir=/usr --user=mysql >/dev/null 2>&1 &
+	safe_pid=$!
+	# Spin for a maximum of N seconds waiting for the server to come up;
+	# exit the loop immediately if mysqld_safe process disappears.
+	# Rather than assuming we know a valid username, accept an "access
+	# denied" response as meaning the server is functioning.
+	ret=0
+	TIMEOUT="$STARTTIMEOUT"
+	while [ $TIMEOUT -gt 0 ]; do
+	    RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1` && break
+	    echo "$RESPONSE" | grep -q "Access denied for user" && break
+	    if ! /bin/kill -0 $safe_pid 2>/dev/null; then
+		echo "MySQL Daemon failed to start."
+		ret=1
+		break
+	    fi
+	    sleep 1
+	    let TIMEOUT=${TIMEOUT}-1
+	done
+	if [ $TIMEOUT -eq 0 ]; then
+	    echo "Timeout error occurred trying to start MySQL Daemon."
+	    ret=1
+	fi
+	if [ $ret -eq 0 ]; then
+	    action $"Starting $prog: " /bin/true
+	    touch $lockfile
+	else
+	    action $"Starting $prog: " /bin/false
+	fi
+    fi
+    return $ret
+}
+
+stop(){
+	if [ ! -f "$mypidfile" ]; then
+	    # not running; per LSB standards this is "ok"
+	    action $"Stopping $prog: " /bin/true
+	    return 0
+	fi
+	MYSQLPID=`cat "$mypidfile"`
+	if [ -n "$MYSQLPID" ]; then
+	    /bin/kill "$MYSQLPID" >/dev/null 2>&1
+	    ret=$?
+	    if [ $ret -eq 0 ]; then
+		TIMEOUT="$STOPTIMEOUT"
+		while [ $TIMEOUT -gt 0 ]; do
+		    /bin/kill -0 "$MYSQLPID" >/dev/null 2>&1 || break
+		    sleep 1
+		    let TIMEOUT=${TIMEOUT}-1
+		done
+		if [ $TIMEOUT -eq 0 ]; then
+		    echo "Timeout error occurred trying to stop MySQL Daemon."
+		    ret=1
+		    action $"Stopping $prog: " /bin/false
+		else
+		    rm -f $lockfile
+		    rm -f "$socketfile"
+		    action $"Stopping $prog: " /bin/true
+		fi
+	    else
+		action $"Stopping $prog: " /bin/false
+	    fi
+	else
+	    # failed to read pidfile, probably insufficient permissions
+	    action $"Stopping $prog: " /bin/false
+	    ret=4
+	fi
+	return $ret
+}
+ 
+restart(){
+    stop
+    start
+}
+
+condrestart(){
+    [ -e $lockfile ] && restart || :
+}
+
+
+# See how we were called.
+case "$1" in
+  start)
+    start
+    ;;
+  stop)
+    stop
+    ;;
+  status)
+    status -p "$mypidfile" $prog
+    ;;
+  restart)
+    restart
+    ;;
+  condrestart|try-restart)
+    condrestart
+    ;;
+  reload)
+    exit 3
+    ;;
+  force-reload)
+    restart
+    ;;
+  *)
+    echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+    exit 2
+esac
+
+exit $?
 
=== added file 'packaging/rpm-oel/mysql.spec.in'
--- packaging/rpm-oel/mysql.spec.in	1970-01-01 00:00:00 +0000
+++ packaging/rpm-oel/mysql.spec.in	2014-02-03 08:11:10 +0000
@@ -0,0 +1,1556 @@
+# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING. If not, write to the
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
+# MA  02110-1301  USA.
+
+
+# NOTE: "vendor" is used in upgrade/downgrade check, so you can't
+# change these, has to be exactly as is.
+
+%global mysql_vendor Oracle and/or its affiliates
+%global mysqldatadir /var/lib/mysql
+
+# By default, a build will include the bundeled "yaSSL" library for SSL.
+%{?with_ssl: %global ssl_option -DWITH_SSL=%{with_ssl}}
+
+# Regression tests may take a long time, override the default to skip them
+%{!?runselftest:%global runselftest 0}
+
+%{!?with_systemd:                %global systemd 0}
+%{!?with_debuginfo:              %global nodebuginfo 1}
+%{!?product_suffix:              %global product_suffix community}
+%{!?feature_set:                 %global feature_set community}
+%{!?compilation_comment_release: %global compilation_comment_release MySQL Community Server - (GPL)}
+%{!?compilation_comment_debug:   %global compilation_comment_debug MySQL Community Server - Debug (GPL)}
+%{!?src_base:                    %global src_base mysql}
+
+%global libmysqld_so_major    0
+%global libmysqld_so_long     0.0.1
+
+# Version for compat libs
+%global compatver             5.1.72
+
+%global src_dir               %{src_base}-%{version}
+
+# No debuginfo for now, ships /usr/sbin/mysqld-debug and libmysqlcliet-debug.a
+%if 0%{?nodebuginfo}
+%global _enable_debug_package 0
+%global debug_package         %{nil}
+%global __os_install_post     /usr/lib/rpm/brp-compress %{nil}
+%endif
+
+# multiarch
+%global multiarchs            ppc %{power64} %{ix86} x86_64 %{sparc}
+
+%if 0%{?commercial}
+%global license_files_server  %{src_dir}/LICENSE.mysql
+%global license_type          Commercial
+%else
+%global license_files_server  %{src_dir}/COPYING %{src_dir}/README
+%global license_type          GPLv2
+%endif
+
+
+Name:           mysql-%{product_suffix}
+Summary:        A very fast and reliable SQL database server
+Group:          Applications/Databases
+Version:        @VERSION@
+Release:        1%{?dist}
+License:        Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.
+Source0:        https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
+URL:            http://www.mysql.com/
+Packager:       MySQL Release Engineering <[e-mail]>
+Vendor:         %{mysql_vendor}
+Source1:        mysql-systemd-start
+Source2:        mysqld.service
+Source3:        mysql.conf
+Source4:        my_config.h
+Source5:        mysql_config.sh
+Source6:        mysql-embedded-check.c
+Source7:        https://cdn.mysql.com/Downloads/MySQL-5.5/mysql-%{compatver}.tar.gz
+Source90:       filter-provides.sh
+Source91:       filter-requires.sh
+BuildRequires:  cmake
+BuildRequires:  perl
+BuildRequires:  time
+BuildRequires:  libaio-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  openssl-devel
+BuildRequires:  zlib-devel
+%if 0%{?systemd}
+BuildRequires:  systemd-units
+%endif
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+# https://fedoraproject.org/wiki/EPEL:Packaging#Generic_Filtering_on_EPEL6
+%global __perl_provides %{SOURCE90}
+%global __perl_requires %{SOURCE91}
+
+%description
+The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+and robust SQL (Structured Query Language) database server. MySQL Server
+is intended for mission-critical, heavy-load production systems as well
+as for embedding into mass-deployed software. MySQL is a trademark of
+%{mysql_vendor}
+
+The MySQL software has Dual Licensing, which means you can use the MySQL
+software free of charge under the GNU General Public License
+(http://www.gnu.org/licenses/). You can also purchase commercial MySQL
+licenses from %{mysql_vendor} if you do not wish to be bound by the terms of
+the GPL. See the chapter "Licensing and Support" in the manual for
+further info.
+
+The MySQL web site (http://www.mysql.com/) provides the latest
+news and information about the MySQL software. Also please see the
+documentation and the manual for more information.
+
+%package        server
+Summary:        A very fast and reliable SQL database server
+Group:          Applications/Databases
+Requires:       coreutils
+Requires:       grep
+Requires:       procps
+Requires:       shadow-utils
+Requires:       net-tools
+%if 0%{?commercial}
+Obsoletes:      mysql-community-server < %{version}-%{release}
+Requires:       mysql-enterprise-client%{?_isa} = %{version}-%{release}
+Requires:       mysql-enterprise-common%{?_isa} = %{version}-%{release}
+%else
+Requires:       mysql-community-client%{?_isa} = %{version}-%{release}
+Requires:       mysql-community-common%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      mysql-server < %{version}-%{release}
+Provides:       mysql-server = %{version}-%{release}
+Provides:       mysql-server%{?_isa} = %{version}-%{release}
+%if 0%{?systemd}
+Requires(post):   systemd
+Requires(preun):  systemd
+Requires(postun): systemd
+%else
+Requires(post):   /sbin/chkconfig
+Requires(preun):  /sbin/chkconfig
+Requires(preun):  /sbin/service
+%endif
+
+%description    server
+The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+and robust SQL (Structured Query Language) database server. MySQL Server
+is intended for mission-critical, heavy-load production systems as well
+as for embedding into mass-deployed software. MySQL is a trademark of
+%{mysql_vendor}
+
+The MySQL software has Dual Licensing, which means you can use the MySQL
+software free of charge under the GNU General Public License
+(http://www.gnu.org/licenses/). You can also purchase commercial MySQL
+licenses from %{mysql_vendor} if you do not wish to be bound by the terms of
+the GPL. See the chapter "Licensing and Support" in the manual for
+further info.
+
+The MySQL web site (http://www.mysql.com/) provides the latest news and
+information about the MySQL software.  Also please see the documentation
+and the manual for more information.
+
+This package includes the MySQL server binary as well as related utilities
+to run and administer a MySQL server.
+
+%package        client
+Summary:        MySQL database client applications and tools
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-client < %{version}-%{release}
+Requires:       mysql-enterprise-libs%{?_isa} = %{version}-%{release}
+%else
+Requires:       mysql-community-libs%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      mysql < %{version}-%{release}
+Provides:       mysql = %{version}-%{release}
+Provides:       mysql%{?_isa} = %{version}-%{release}
+
+%description    client
+This package contains the standard MySQL clients and administration
+tools.
+
+%package        common
+Summary:        MySQL database common files for server and client libs
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-common < %{version}-%{release}
+%endif
+Provides:       mysql-common = %{version}-%{release}
+Provides:       mysql-common%{?_isa} = %{version}-%{release}
+
+%description    common
+This packages contains common files needed by MySQL client library,
+MySQL database server, and MySQL embedded server.
+
+
+%package        test
+Summary:        Test suite for the MySQL database server
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-test < %{version}-%{release}
+Requires:       mysql-enterprise-server%{?_isa} = %{version}-%{release}
+%else
+Requires:       mysql-community-server%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      mysql-test < %{version}-%{release}
+Provides:       mysql-test = %{version}-%{release}
+Provides:       mysql-test%{?_isa} = %{version}-%{release}
+
+
+%description    test
+This package contains the MySQL regression test suite for MySQL
+database server.
+
+
+%package        devel
+Summary:        Development header files and libraries for MySQL database client applications
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-devel < %{version}-%{release}
+Requires:       mysql-enterprise-libs%{?_isa} = %{version}-%{release}
+%else
+Requires:       mysql-community-libs%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      mysql-devel < %{version}-%{release}
+Provides:       mysql-devel = %{version}-%{release}
+Provides:       mysql-devel%{?_isa} = %{version}-%{release}
+
+%description    devel
+This package contains the development header files and libraries necessary
+to develop MySQL client applications.
+
+%package        libs
+Summary:        Shared libraries for MySQL database client applications
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-libs < %{version}-%{release}
+Requires:       mysql-enterprise-common%{?_isa} = %{version}-%{release}
+%else
+Requires:       mysql-community-common%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      mysql-libs < %{version}-%{release}
+Provides:       mysql-libs = %{version}-%{release}
+Provides:       mysql-libs%{?_isa} = %{version}-%{release}
+
+%description    libs
+This package contains the shared libraries for MySQL client
+applications.
+
+%package        libs-compat
+Summary:        Shared compat libraries for MySQL 5.1 database client applications
+Group:          Applications/Databases
+Obsoletes:      mysql-libs-compat < %{version}-%{release}
+Provides:       mysql-libs-compat = %{version}-%{release}
+Provides:       mysql-libs-compat%{?_isa} = %{version}-%{release}
+
+%description    libs-compat
+This package contains the shared compat libraries for MySQL 5.1 client
+applications.
+
+%package        embedded
+Summary:        MySQL embedded library
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-embedded < %{version}-%{release}
+Requires:       mysql-enterprise-common%{?_isa} = %{version}-%{release}
+%else
+Requires:       mysql-community-common%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      mysql-embedded < %{version}-%{release}
+Provides:       mysql-embedded = %{version}-%{release}
+Provides:       mysql-emdedded%{?_isa} = %{version}-%{release}
+
+%description    embedded
+This package contains the mysql server as an embedded library.
+
+The embedded MySQL server library makes it possible to run a full-featured
+MySQL server inside the client application. The main benefits are increased
+speed and more simple management for embedded applications.
+
+The API is identical for the embedded MySQL version and the
+client/server version.
+
+For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
+
+%package        embedded-devel
+Summary:        Development header files and libraries for MySQL as an embeddable library
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-embedded-devel < %{version}-%{release}
+Requires:       mysql-enterprise-devel%{?_isa} = %{version}-%{release}
+Requires:       mysql-enterprise-embedded%{?_isa} = %{version}-%{release}
+%else
+Requires:       mysql-community-devel%{?_isa} = %{version}-%{release}
+Requires:       mysql-community-embedded%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      mysql-embedded-devel < %{version}-%{release}
+Provides:       mysql-embedded-devel = %{version}-%{release}
+Provides:       mysql-embedded-devel%{?_isa} = %{version}-%{release}
+
+%description    embedded-devel
+This package contains files needed for developing applicatison using
+the embedded version of the MySQL server.
+
+%prep
+%setup -q -T -a 0 -a 7 -c -n %{src_dir}
+cd %{src_dir}
+
+%build
+# Fail quickly and obviously if user tries to build as root
+%if 0%{?runselftest}
+if [ "x$(id -u)" = "x0" ] ; then
+   echo "The MySQL regression tests may fail if run as root."
+   echo "If you really need to build the RPM as root, use"
+   echo "--define='runselftest 0' to skip the regression tests."
+   exit 1
+fi
+%endif
+
+# Build compat libs
+(
+export CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fno-strict-aliasing -fwrapv"
+export CXXFLAGS="$CFLAGS -felide-constructors -fno-rtti -fno-exceptions"
+pushd mysql-%{compatver}
+%configure \
+    --with-readline \
+    --with-ssl=%{_prefix} \
+    --without-debug \
+    --enable-shared \
+    --with-embedded-server \
+    --localstatedir=/var/lib/mysql \
+    --with-unix-socket-path=/var/lib/mysql/mysql.sock \
+    --with-mysqld-user="mysql" \
+    --with-extra-charsets=all \
+    --with-big-tables \
+    --with-pic \
+    --with-plugin-innobase \
+    --with-plugin-innodb_plugin \
+    --with-plugin-partition \
+    --enable-local-infile \
+    --enable-largefile \
+    --enable-thread-safe-client \
+    --disable-dependency-tracking
+make %{?_smp_mflags}
+popd
+)
+
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
+
+# Build debug versions of mysqld and libmysqld.a
+mkdir debug
+(
+  cd debug
+  # Attempt to remove any optimisation flags from the debug build
+  CFLAGS=$(echo "${CFLAGS}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /')
+  CXXFLAGS=$(echo "${CFLAGS}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /') 
+  cmake ../%{src_dir} \
+           -DBUILD_CONFIG=mysql_release \
+           -DINSTALL_LAYOUT=RPM \
+           -DCMAKE_BUILD_TYPE=Debug \
+           -DWITH_INNODB_MEMCACHED=1 \
+           -DINSTALL_LIBDIR="%{_lib}/mysql" \
+           -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
+           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
+           -DFEATURE_SET="%{feature_set}" \
+           %{?ssl_option} \
+           -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
+           -DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
+  echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
+  make %{?_smp_mflags} VERBOSE=1
+)
+
+# Build full release
+mkdir release
+(
+  cd release
+  cmake ../%{src_dir} \
+           -DBUILD_CONFIG=mysql_release \
+           -DINSTALL_LAYOUT=RPM \
+           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+           -DWITH_INNODB_MEMCACHED=1 \
+           -DINSTALL_LIBDIR="%{_lib}/mysql" \
+           -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
+           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
+           -DFEATURE_SET="%{feature_set}" \
+           %{?ssl_option} \
+           -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
+           -DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
+  echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
+  make %{?_smp_mflags} VERBOSE=1
+
+# Need to build libmysqld.so for distros
+mkdir libmysqld/work
+pushd libmysqld/work
+
+ar -x ../libmysqld.a
+[ -e ../../extra/yassl/libyassl.a ] && ar -x ../../extra/yassl/libyassl.a
+rm -f sql_binlog.cc.o rpl_utility.cc.o
+%{__cc} $CFLAGS $LDFLAGS -DEMBEDDED_LIBRARY -shared -Wl,-soname,libmysqld.so.%{libmysqld_so_major} \
+       -o libmysqld.so.%{libmysqld_so_long} *.o \
+       -lpthread -laio -lcrypt -lssl -lcrypto -lz -lrt -lstdc++ -ldl -lm -lc
+
+# Compile check
+cp %{SOURCE6} .
+ln -s libmysqld.so.%{libmysqld_so_long} libmysqld.so.%{libmysqld_so_major}
+%{__cc} -I../../../%{src_dir}/include -I../../include $CFLAGS \
+       mysql-embedded-check.c libmysqld.so.%{libmysqld_so_major}
+LD_LIBRARY_PATH=. ldd ./a.out
+)
+
+%install
+# Install compat libs
+for dir in libmysql libmysql_r ; do
+    pushd mysql-%{compatver}/$dir
+    make DESTDIR=%{buildroot} install
+    popd
+done
+rm -f %{buildroot}%{_libdir}/mysql/libmysqlclient{,_r}.{a,la,so}
+
+MBD=$RPM_BUILD_DIR/%{src_dir}
+
+# Ensure that needed directories exists
+install -d -m 0755 %{buildroot}%{_datadir}/mysql/SELinux/RHEL4
+install -d -m 0755 %{buildroot}/var/lib/mysql
+install -d -m 0755 %{buildroot}/var/run/mysqld
+
+# Install all binaries
+cd $MBD/release
+make DESTDIR=%{buildroot} install
+
+# Install logrotate and autostart
+install -D -m 0644 $MBD/release/support-files/mysql-log-rotate %{buildroot}%{_sysconfdir}/logrotate.d/mysql
+install -D -m 0644 $MBD/release/packaging/rpm-oel/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
+%if 0%{?systemd}
+install -D -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/mysql-systemd-start
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/mysqld.service
+%else
+install -D -m 0755 $MBD/release/packaging/rpm-oel/mysql.init %{buildroot}%{_sysconfdir}/init.d/mysqld
+%endif
+install -D -m 0644 %{SOURCE3} %{buildroot}%{_prefix}/lib/tmpfiles.d/mysql.conf
+
+install -m 0755 $MBD/release/libmysqld/work/libmysqld.so.%{libmysqld_so_long} \
+    %{buildroot}%{_libdir}/mysql/libmysqld.so.%{libmysqld_so_long}
+ln -s libmysqld.so.%{libmysqld_so_long} %{buildroot}%{_libdir}/mysql/libmysqld.so.%{libmysqld_so_major}
+ln -s libmysqld.so.%{libmysqld_so_long} %{buildroot}%{_libdir}/mysql/libmysqld.so
+ 
+
+# Make library links
+install -d -m 0755 %{buildroot}%{_sysconfdir}/ld.so.conf.d
+echo "%{_libdir}/mysql" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
+
+# multiarch support
+%ifarch %{multiarchs}
+mv %{buildroot}/%{_includedir}/mysql/my_config.h \
+   %{buildroot}/%{_includedir}/mysql/my_config_%{_arch}.h
+install -p -m 0644 %{SOURCE4} %{buildroot}/%{_includedir}/mysql/my_config.h
+mv %{buildroot}/%{_bindir}/mysql_config %{buildroot}/%{_bindir}/mysql_config-%{__isa_bits}
+install -p -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/mysql_config
+%endif
+
+# Install SELinux files in datadir
+install -m 0644 $MBD/%{src_dir}/support-files/RHEL4-SElinux/mysql.{fc,te} \
+    %{buildroot}%{_datadir}/mysql/SELinux/RHEL4
+
+# Remove files pages we explicitly do not want to package
+rm -rf %{buildroot}%{_datadir}/mysql/solaris
+rm -rf %{buildroot}%{_infodir}/mysql.info*
+rm -rf %{buildroot}%{_datadir}/mysql/binary-configure
+rm -rf %{buildroot}%{_datadir}/mysql/mysql.server
+rm -rf %{buildroot}%{_datadir}/mysql/mysqld_multi.server
+rm -f  %{buildroot}%{_datadir}/mysql/{ndb-config-2-node,config*}.ini
+rm -f  %{buildroot}%{_datadir}/mysql/my-*.cnf
+%if 0%{?systemd}
+rm -rf %{buildroot}%{_sysconfdir}/init.d/mysqld
+%endif
+rm -rf %{buildroot}%{_bindir}/mysql_embedded
+rm -rf %{buildroot}%{_bindir}/mysql_setpermission
+rm -rf %{buildroot}%{_mandir}/man1/mysql_setpermission.1*
+
+%check
+%if 0%{?runselftest}
+pushd release
+make test VERBOSE=1
+export MTR_BUILD_THREAD=auto
+pushd mysql-test
+./mtr \
+    --mem --parallel=auto --force --retry=0 \
+    --mysqld=--binlog-format=mixed \
+    --suite-timeout=720 --testcase-timeout=30
+rm -rf var/*
+%endif
+
+%pre server
+/usr/sbin/groupadd -g 27 -o -r mysql >/dev/null 2>&1 || :
+/usr/sbin/useradd -M -N -g mysql -o -r -d /var/lib/mysql -s /bin/bash \
+    -c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || :
+
+%post server
+datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p')
+/bin/chmod 0755 "$datadir"
+/bin/touch /var/log/mysqld.log
+%if 0%{?systemd}
+%systemd_post mysqld.service
+/sbin/service mysqld enable >/dev/null 2>&1 || :
+%else
+/sbin/chkconfig --add mysqld
+%endif
+
+%preun server
+%if 0%{?systemd}
+%systemd_preun mysqld.service
+%else
+if [ "$1" = 0 ]; then
+    /sbin/service mysqld stop >/dev/null 2>&1 || :
+    /sbin/chkconfig --del mysqld
+fi
+%endif
+
+%postun server
+%if 0%{?systemd}
+%systemd_postun_with_restart mysqld.service
+%else
+if [ $1 -ge 1 ]; then
+    /sbin/service mysqld condrestart >/dev/null 2>&1 || :
+fi
+%endif
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%post libs-compat -p /sbin/ldconfig
+
+%postun libs-compat -p /sbin/ldconfig
+
+%post embedded -p /sbin/ldconfig
+
+%postun embedded -p /sbin/ldconfig
+
+%files server
+%defattr(-, root, root, -)
+%doc %{?license_files_server} %{src_dir}/Docs/ChangeLog
+%doc %{src_dir}/Docs/INFO_SRC*
+%doc release/Docs/INFO_BIN*
+%attr(644, root, root) %{_mandir}/man1/innochecksum.1*
+%attr(644, root, root) %{_mandir}/man1/my_print_defaults.1*
+%attr(644, root, root) %{_mandir}/man1/myisam_ftdump.1*
+%attr(644, root, root) %{_mandir}/man1/myisamchk.1*
+%attr(644, root, root) %{_mandir}/man1/myisamlog.1*
+%attr(644, root, root) %{_mandir}/man1/myisampack.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_convert_table_format.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_fix_extensions.1*
+%attr(644, root, root) %{_mandir}/man8/mysqld.8*
+%attr(644, root, root) %{_mandir}/man1/mysqld_multi.1*
+%attr(644, root, root) %{_mandir}/man1/mysqld_safe.1*
+%attr(644, root, root) %{_mandir}/man1/mysqldumpslow.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_install_db.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_plugin.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_secure_installation.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_upgrade.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlhotcopy.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlman.1*
+%attr(644, root, root) %{_mandir}/man1/mysql.server.1*
+%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_zap.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlbug.1*
+%attr(644, root, root) %{_mandir}/man1/perror.1*
+%attr(644, root, root) %{_mandir}/man1/replace.1*
+%attr(644, root, root) %{_mandir}/man1/resolve_stack_dump.1*
+%attr(644, root, root) %{_mandir}/man1/resolveip.1*
+
+%config(noreplace) %{_sysconfdir}/my.cnf
+
+%attr(755, root, root) %{_bindir}/innochecksum
+%attr(755, root, root) %{_bindir}/my_print_defaults
+%attr(755, root, root) %{_bindir}/myisam_ftdump
+%attr(755, root, root) %{_bindir}/myisamchk
+%attr(755, root, root) %{_bindir}/myisamlog
+%attr(755, root, root) %{_bindir}/myisampack
+%attr(755, root, root) %{_bindir}/mysql_convert_table_format
+%attr(755, root, root) %{_bindir}/mysql_fix_extensions
+%attr(755, root, root) %{_bindir}/mysql_install_db
+%attr(755, root, root) %{_bindir}/mysql_plugin
+%attr(755, root, root) %{_bindir}/mysql_secure_installation
+%attr(755, root, root) %{_bindir}/mysql_tzinfo_to_sql
+%attr(755, root, root) %{_bindir}/mysql_upgrade
+%attr(755, root, root) %{_bindir}/mysql_zap
+%attr(755, root, root) %{_bindir}/mysqlbug
+%attr(755, root, root) %{_bindir}/mysqld_multi
+%attr(755, root, root) %{_bindir}/mysqld_safe
+%attr(755, root, root) %{_bindir}/mysqldumpslow
+%attr(755, root, root) %{_bindir}/mysqlhotcopy
+%attr(755, root, root) %{_bindir}/mysqltest
+%attr(755, root, root) %{_bindir}/perror
+%attr(755, root, root) %{_bindir}/replace
+%attr(755, root, root) %{_bindir}/resolve_stack_dump
+%attr(755, root, root) %{_bindir}/resolveip
+%if 0%{?systemd}
+%attr(755, root, root) %{_bindir}/mysql-systemd-start
+%endif
+%attr(755, root, root) %{_sbindir}/mysqld
+%attr(755, root, root) %{_sbindir}/mysqld-debug
+
+%{_libdir}/mysql/plugin
+
+%attr(644, root, root) %{_datadir}/mysql/fill_help_tables.sql
+%attr(644, root, root) %{_datadir}/mysql/mysql_system_tables.sql
+%attr(644, root, root) %{_datadir}/mysql/mysql_system_tables_data.sql
+%attr(644, root, root) %{_datadir}/mysql/mysql_test_data_timezone.sql
+%attr(644, root, root) %{_datadir}/mysql/mysql-log-rotate
+%attr(644, root, root) %{_datadir}/mysql/SELinux/RHEL4/mysql.fc
+%attr(644, root, root) %{_datadir}/mysql/SELinux/RHEL4/mysql.te
+%attr(644, root, root) %{_datadir}/mysql/magic
+%attr(644, root, root) %{_prefix}/lib/tmpfiles.d/mysql.conf
+%if 0%{?systemd}
+%attr(644, root, root) %{_unitdir}/mysql.service
+%else
+%attr(755, root, root) %{_sysconfdir}/init.d/mysqld
+%endif
+%attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
+%dir %attr(755, mysql, mysql) /var/lib/mysql
+%dir %attr(755, mysql, mysql) /var/run/mysqld
+
+%files common
+%defattr(-, root, root, -)
+%{_datadir}/mysql/charsets/
+%{_datadir}/mysql/errmsg-utf8.txt
+%{_datadir}/mysql/czech/
+%{_datadir}/mysql/danish/
+%{_datadir}/mysql/dutch/
+%{_datadir}/mysql/english/
+%{_datadir}/mysql/estonian/
+%{_datadir}/mysql/french/
+%{_datadir}/mysql/german/
+%{_datadir}/mysql/greek/
+%{_datadir}/mysql/hungarian/
+%{_datadir}/mysql/italian/
+%{_datadir}/mysql/japanese/
+%{_datadir}/mysql/korean/
+%{_datadir}/mysql/norwegian-ny/
+%{_datadir}/mysql/norwegian/
+%{_datadir}/mysql/polish/
+%{_datadir}/mysql/portuguese/
+%{_datadir}/mysql/romanian/
+%{_datadir}/mysql/russian/
+%{_datadir}/mysql/serbian/
+%{_datadir}/mysql/slovak/
+%{_datadir}/mysql/spanish/
+%{_datadir}/mysql/swedish/
+%{_datadir}/mysql/ukrainian/
+
+%files client
+%defattr(-, root, root, -)
+%attr(755, root, root) %{_bindir}/msql2mysql
+%attr(755, root, root) %{_bindir}/mysql
+%attr(755, root, root) %{_bindir}/mysql_find_rows
+%attr(755, root, root) %{_bindir}/mysql_waitpid
+%attr(755, root, root) %{_bindir}/mysqlaccess
+# XXX: This should be moved to %{_sysconfdir}
+%attr(644, root, root) %{_bindir}/mysqlaccess.conf
+%attr(755, root, root) %{_bindir}/mysqladmin
+%attr(755, root, root) %{_bindir}/mysqlbinlog
+%attr(755, root, root) %{_bindir}/mysqlcheck
+%attr(755, root, root) %{_bindir}/mysqldump
+%attr(755, root, root) %{_bindir}/mysqlimport
+%attr(755, root, root) %{_bindir}/mysqlshow
+%attr(755, root, root) %{_bindir}/mysqlslap
+%attr(755, root, root) %{_bindir}/mysql_config
+%attr(755, root, root) %{_bindir}/mysql_config-%{__isa_bits}
+
+%attr(644, root, root) %{_mandir}/man1/msql2mysql.1*
+%attr(644, root, root) %{_mandir}/man1/mysql.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_find_rows.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_waitpid.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlaccess.1*
+%attr(644, root, root) %{_mandir}/man1/mysqladmin.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlbinlog.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlcheck.1*
+%attr(644, root, root) %{_mandir}/man1/mysqldump.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlimport.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlshow.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlslap.1*
+
+%files devel
+%defattr(-, root, root, -)
+%attr(644, root, root) %{_mandir}/man1/comp_err.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_config.1*
+%attr(755, root, root) %{_bindir}/mysql_config
+%attr(755, root, root) %{_bindir}/mysql_config-%{__isa_bits}
+%{_includedir}/mysql
+%{_datadir}/aclocal/mysql.m4
+%{_libdir}/mysql/libmysqlclient.a
+%{_libdir}/mysql/libmysqlclient_r.a
+%{_libdir}/mysql/libmysqlservices.a
+%{_libdir}/mysql/libmysqlclient_r.so
+%{_libdir}/mysql/libmysqlclient.so
+
+%files libs
+%defattr(-, root, root, -)
+%dir %attr(755, root, root) %{_libdir}/mysql
+%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
+%{_libdir}/mysql/libmysqlclient.so.18*
+%{_libdir}/mysql/libmysqlclient_r.so.18*
+
+%files libs-compat
+%defattr(-, root, root, -)
+%dir %attr(755, root, root) %{_libdir}/mysql
+%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
+%{_libdir}/mysql/libmysqlclient.so.16
+%{_libdir}/mysql/libmysqlclient.so.16.0.0
+%{_libdir}/mysql/libmysqlclient_r.so.16
+%{_libdir}/mysql/libmysqlclient_r.so.16.0.0
+
+%files test
+%defattr(-, root, root, -)
+%attr(-, root, root) %{_datadir}/mysql-test
+%attr(755, root, root) %{_bindir}/mysql_client_test
+%attr(755, root, root) %{_bindir}/mysql_client_test_embedded
+%attr(755, root, root) %{_bindir}/mysqltest_embedded
+%attr(644, root, root) %{_mandir}/man1/mysql_client_test.1*
+%attr(644, root, root) %{_mandir}/man1/mysql-stress-test.pl.1*
+%attr(644, root, root) %{_mandir}/man1/mysql-test-run.pl.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_client_test_embedded.1*
+%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1*
+
+%files embedded
+%defattr(-, root, root, -)
+%dir %attr(755, root, root) %{_libdir}/mysql
+%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
+%attr(644, root, root) %{_libdir}/mysql/libmysqld.so.*
+
+%files embedded-devel
+%defattr(-, root, root, -)
+%attr(644, root, root) %{_libdir}/mysql/libmysqld.a
+%attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a
+%attr(755, root, root) %{_libdir}/mysql/libmysqld.so
+
+%changelog
+* Fri Oct 25 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.15-1
+- Fixed uln advanced rpm libyassl.a error
+- Updated to 5.6.15
+
+* Wed Oct 16 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.14-3
+- Fixed mysql_install_db usage 
+- Improved handling of plugin directory 
+
+* Fri Sep 27 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.14-2
+- Refresh mysql-install patch and service renaming
+
+* Mon Sep 16 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.14-1
+- Updated to 5.6.14
+
+* Wed Sep 04 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.13-5
+- Support upgrade from 5.5 ULN packages to 5.6 
+
+* Tue Aug 27 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.13-4
+- Enhanced perl filtering 
+- Added openssl-devel to buildreq 
+
+* Wed Aug 21 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.13-3
+- Removed mysql_embedded binary to resolve multilib conflict issue
+
+* Fri Aug 16 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.13-2 
+- Fixed Provides and Obsoletes issues in server, test packages 
+
+* Wed Aug 14 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.13-1
+- Updated to 5.6.13
+
+* Mon Aug 05 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.12-9
+- Added files list to embedded packages 
+
+* Thu Aug 01 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.12-8
+- Updated libmysqld.a with libmysqld.so in embedded package
+
+* Mon Jul 29 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.12-7
+- Updated test package dependency from client to server
+
+* Wed Jul 24 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.12-6
+- Added libs-compat dependency under libs package to resolve server
+  installation conflicts issue.
+ 
+* Wed Jul 17 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.12-5
+- Removed libmysqlclient.so.16 from libs package
+ 
+* Fri Jul 05 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.12-4
+- Adjusted to work on OEL6
+
+* Wed Jun 26 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.12-3
+- Move libs to mysql/
+- Basic multi arch support
+- Fix changelog dates
+
+* Thu Jun 20 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.12-2
+- Major cleanup
+
+* Tue Jun 04 2013 Balasubramanian Kandasamy <[e-mail]> - 5.6.12-1
+- Updated to 5.6.12
+
+* Mon Nov 05 2012 Joerg Bruehe <[e-mail]>
+
+- Allow to override the default to use the bundled yaSSL by an option like
+      --define="with_ssl /path/to/ssl"
+
+* Wed Oct 10 2012 Bjorn Munch <[e-mail]>
+
+- Replace old my-*.cnf config file examples with template my-default.cnf
+
+* Fri Oct 05 2012 Joerg Bruehe <[e-mail]>
+
+- Let the installation use the new option "--random-passwords" of "mysql_install_db".
+  (Bug# 12794345 Ensure root password)
+- Fix an inconsistency: "new install" vs "upgrade" are told from the (non)existence
+  of "$mysql_datadir/mysql" (holding table "mysql.user" and other system stuff).
+
+* Tue Jul 24 2012 Joerg Bruehe <[e-mail]>
+
+- Add a macro "runselftest":
+  if set to 1 (default), the test suite will be run during the RPM build;
+  this can be oveeridden via the command line by adding
+      --define "runselftest 0"
+  Failures of the test suite will NOT make the RPM build fail!
+
+* Mon Jul 16 2012 Joerg Bruehe <[e-mail]>
+
+- Add the man page for the "mysql_config_editor".
+
+* Mon Jun 11 2012 Joerg Bruehe <[e-mail]>
+
+- Make sure newly added "SPECIFIC-ULN/" directory does not disturb packaging.
+
+* Wed Feb 29 2012 Brajmohan Saxena <[e-mail]>
+
+- Removal all traces of the readline library from mysql (BUG 13738013)
+
+* Wed Sep 28 2011 Joerg Bruehe <[e-mail]>
+
+- Fix duplicate mentioning of "mysql_plugin" and its manual page,
+  it is better to keep alphabetic order in the files list (merging!).
+
+* Wed Sep 14 2011 Joerg Bruehe <[e-mail]>
+
+- Let the RPM capabilities ("obsoletes" etc) ensure that an upgrade may replace
+  the RPMs of any configuration (of the current or the preceding release series)
+  by the new ones. This is done by not using the implicitly generated capabilities
+  (which include the configuration name) and relying on more generic ones which
+  just list the function ("server", "client", ...).
+  The implicit generation cannot be prevented, so all these capabilities must be
+  explicitly listed in "Obsoletes:"
+
+* Tue Sep 13 2011 Jonathan Perkin <[e-mail]>
+
+- Add support for Oracle Linux 6 and Red Hat Enterprise Linux 6.  Due to
+  changes in RPM behaviour ($RPM_BUILD_ROOT is removed prior to install)
+  this necessitated a move of the libmygcc.a installation to the install
+  phase, which is probably where it belonged in the first place.
+
+* Tue Sep 13 2011 Joerg Bruehe <[e-mail]>
+
+- "make_win_bin_dist" and its manual are dropped, cmake does it different.
+
+* Thu Sep 08 2011 Daniel Fischer <[e-mail]>
+
+- Add mysql_plugin man page.
+
+* Tue Aug 30 2011 Tor Didriksen <[e-mail]>
+
+- Set CXX=g++ by default to add a dependency on libgcc/libstdc++.
+  Also, remove the use of the -fno-exceptions and -fno-rtti flags.
+  TODO: update distro_buildreq/distro_requires
+
+* Tue Aug 30 2011 Joerg Bruehe <[e-mail]>
+
+- Add the manual page for "mysql_plugin" to the server package.
+
+* Fri Aug 19 2011 Joerg Bruehe <[e-mail]>
+
+- Null-upmerge the fix of bug#37165: This spec file is not affected.
+- Replace "/var/lib/mysql" by the spec file variable "%{mysqldatadir}".
+
+* Fri Aug 12 2011 Daniel Fischer <[e-mail]>
+
+- Source plugin library files list from cmake-generated file.
+
+* Mon Jul 25 2011 Chuck Bell <[e-mail]>
+
+- Added the mysql_plugin client - enables or disables plugins.
+
+* Thu Jul 21 2011 Sunanda Menon <[e-mail]>
+
+- Fix bug#12561297: Added the MySQL embedded binary
+
+* Thu Jul 07 2011 Joerg Bruehe <[e-mail]>
+
+- Fix bug#45415: "rpm upgrade recreates test database"
+  Let the creation of the "test" database happen only during a new installation,
+  not in an RPM upgrade.
+  This affects both the "mkdir" and the call of "mysql_install_db".
+
+* Wed Feb 09 2011 Joerg Bruehe <[e-mail]>
+
+- Fix bug#56581: If an installation deviates from the default file locations
+  ("datadir" and "pid-file"), the mechanism to detect a running server (on upgrade)
+  should still work, and use these locations.
+  The problem was that the fix for bug#27072 did not check for local settings.
+
+* Mon Jan 31 2011 Joerg Bruehe <[e-mail]>
+
+- Install the new "manifest" files: "INFO_SRC" and "INFO_BIN".
+
+* Tue Nov 23 2010 Jonathan Perkin <[e-mail]>
+
+- EXCEPTIONS-CLIENT has been deleted, remove it from here too
+- Support MYSQL_BUILD_MAKE_JFLAG environment variable for passing
+  a '-j' argument to make.
+
+* Mon Nov 1 2010 Georgi Kodinov <[e-mail]>
+
+- Added test authentication (WL#1054) plugin binaries
+
+* Wed Oct 6 2010 Georgi Kodinov <[e-mail]>
+
+- Added example external authentication (WL#1054) plugin binaries
+
+* Wed Aug 11 2010 Joerg Bruehe <[e-mail]>
+
+- With a recent spec file cleanup, names have changed: A "-community" part was dropped.
+  Reflect that in the "Obsoletes" specifications.
+- Add a "triggerpostun" to handle the uninstall of the "-community" server RPM.
+- This fixes bug#55015 "MySQL server is not restarted properly after RPM upgrade".
+
+* Tue Jun 15 2010 Joerg Bruehe <[e-mail]>
+
+- Change the behaviour on installation and upgrade:
+  On installation, do not autostart the server.
+  *Iff* the server was stopped before the upgrade is started, this is taken as a
+  sign the administrator is handling that manually, and so the new server will
+  not be started automatically at the end of the upgrade.
+  The start/stop scripts will still be installed, so the server will be started
+  on the next machine boot.
+  This is the 5.5 version of fixing bug#27072 (RPM autostarting the server).
+
+* Tue Jun 1 2010 Jonathan Perkin <[e-mail]>
+
+- Implement SELinux checks from distribution-specific spec file.
+
+* Wed May 12 2010 Jonathan Perkin <[e-mail]>
+
+- Large number of changes to build using CMake
+- Introduce distribution-specific RPMs
+- Drop debuginfo, build all binaries with debug/symbols
+- Remove __os_install_post, use native macro