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

[Laurynas Biveinis]

Merge 5.5.32.

Revert the fixes for the following bugs due to upstream fixes, but keeping
our testcases where applicable:
- bug 1155859,
- bug 1017192,
- bug 1135097.

Other non-automerge bits:
- Resolve conflicts around dict_update_statistics() declaration and
  calls due to us having added an arg previously and upstream having
  added an arg in 5.5.32.
- Adjust a regexp in rpl_mdev382 to match the changes in foreign key
  name output.
- Add MTR suppressions for the additional diagnostics in 5.6.12 for
  percona_bug_999147.test.

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'Percona-Server/BUILD/SETUP.sh'
--- Percona-Server/BUILD/SETUP.sh	2011-06-30 15:46:53 +0000
+++ Percona-Server/BUILD/SETUP.sh	2013-06-26 08:18:34 +0000
@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 ########################################################################
 

=== modified file 'Percona-Server/BUILD/cleanup'
--- Percona-Server/BUILD/cleanup	2010-12-28 18:57:23 +0000
+++ Percona-Server/BUILD/cleanup	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-alpha'
--- Percona-Server/BUILD/compile-alpha	2010-12-28 18:57:23 +0000
+++ Percona-Server/BUILD/compile-alpha	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-alpha-debug'
--- Percona-Server/BUILD/compile-alpha-debug	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-alpha-debug	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 /bin/rm -f */.deps/*.P */*.o
 make -k maintainer-clean

=== modified file 'Percona-Server/BUILD/compile-amd64-debug-max'
--- Percona-Server/BUILD/compile-amd64-debug-max	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-amd64-debug-max	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-amd64-debug-max-no-ndb'
--- Percona-Server/BUILD/compile-amd64-debug-max-no-ndb	2010-12-28 23:47:05 +0000
+++ Percona-Server/BUILD/compile-amd64-debug-max-no-ndb	2013-06-26 08:18:34 +0000
@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-amd64-gcov'
--- Percona-Server/BUILD/compile-amd64-gcov	2010-12-28 18:57:23 +0000
+++ Percona-Server/BUILD/compile-amd64-gcov	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-amd64-gprof'
--- Percona-Server/BUILD/compile-amd64-gprof	2010-12-28 18:57:23 +0000
+++ Percona-Server/BUILD/compile-amd64-gprof	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-amd64-max'
--- Percona-Server/BUILD/compile-amd64-max	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-amd64-max	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-amd64-max-sci'
--- Percona-Server/BUILD/compile-amd64-max-sci	2010-12-28 18:57:23 +0000
+++ Percona-Server/BUILD/compile-amd64-max-sci	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-amd64-valgrind-max'
--- Percona-Server/BUILD/compile-amd64-valgrind-max	2010-12-29 00:26:31 +0000
+++ Percona-Server/BUILD/compile-amd64-valgrind-max	2013-06-26 08:18:34 +0000
@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-darwin-mwcc'
--- Percona-Server/BUILD/compile-darwin-mwcc	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-darwin-mwcc	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-hpux11-parisc2-aCC'
--- Percona-Server/BUILD/compile-hpux11-parisc2-aCC	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-hpux11-parisc2-aCC	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 if [ ! -f "sql/mysqld.cc" ]; then
   echo "You must run this script from the MySQL top-level directory."

=== modified file 'Percona-Server/BUILD/compile-irix-mips64-mipspro'
--- Percona-Server/BUILD/compile-irix-mips64-mipspro	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-irix-mips64-mipspro	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 if [ ! -f "sql/mysqld.cc" ]; then
   echo "You must run this script from the MySQL top-level directory."

=== modified file 'Percona-Server/BUILD/compile-ndb-autotest'
--- Percona-Server/BUILD/compile-ndb-autotest	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-ndb-autotest	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-pentium'
--- Percona-Server/BUILD/compile-pentium	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-pentium	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-pentium-cybozu'
--- Percona-Server/BUILD/compile-pentium-cybozu	2010-12-28 18:57:23 +0000
+++ Percona-Server/BUILD/compile-pentium-cybozu	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-pentium-debug-max-no-embedded'
--- Percona-Server/BUILD/compile-pentium-debug-max-no-embedded	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-pentium-debug-max-no-embedded	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-pentium-debug-max-no-ndb'
--- Percona-Server/BUILD/compile-pentium-debug-max-no-ndb	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-pentium-debug-max-no-ndb	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-pentium-gcov'
--- Percona-Server/BUILD/compile-pentium-gcov	2010-12-28 23:47:05 +0000
+++ Percona-Server/BUILD/compile-pentium-gcov	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 # Need to disable ccache, or we loose the gcov-needed compiler output files.
 

=== modified file 'Percona-Server/BUILD/compile-pentium-gprof'
--- Percona-Server/BUILD/compile-pentium-gprof	2010-12-28 18:57:23 +0000
+++ Percona-Server/BUILD/compile-pentium-gprof	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-pentium-icc'
--- Percona-Server/BUILD/compile-pentium-icc	2010-12-28 18:57:23 +0000
+++ Percona-Server/BUILD/compile-pentium-icc	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-pentium-icc-yassl'
--- Percona-Server/BUILD/compile-pentium-icc-yassl	2010-12-28 18:57:23 +0000
+++ Percona-Server/BUILD/compile-pentium-icc-yassl	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-pentium-max'
--- Percona-Server/BUILD/compile-pentium-max	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-pentium-max	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-pentium-myodbc'
--- Percona-Server/BUILD/compile-pentium-myodbc	2010-12-28 18:57:23 +0000
+++ Percona-Server/BUILD/compile-pentium-myodbc	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-pentium-pgcc'
--- Percona-Server/BUILD/compile-pentium-pgcc	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-pentium-pgcc	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 AM_MAKEFLAGS="-j 2"
 gmake -k maintainer-clean || true

=== modified file 'Percona-Server/BUILD/compile-pentium-valgrind-max-no-ndb'
--- Percona-Server/BUILD/compile-pentium-valgrind-max-no-ndb	2010-12-29 00:26:31 +0000
+++ Percona-Server/BUILD/compile-pentium-valgrind-max-no-ndb	2013-06-26 08:18:34 +0000
@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-pentium64'
--- Percona-Server/BUILD/compile-pentium64	2010-12-28 23:47:05 +0000
+++ Percona-Server/BUILD/compile-pentium64	2013-06-26 08:18:34 +0000
@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-pentium64-gcov'
--- Percona-Server/BUILD/compile-pentium64-gcov	2010-12-28 18:57:23 +0000
+++ Percona-Server/BUILD/compile-pentium64-gcov	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-pentium64-gprof'
--- Percona-Server/BUILD/compile-pentium64-gprof	2010-12-28 18:57:23 +0000
+++ Percona-Server/BUILD/compile-pentium64-gprof	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-pentium64-max'
--- Percona-Server/BUILD/compile-pentium64-max	2010-12-28 23:47:05 +0000
+++ Percona-Server/BUILD/compile-pentium64-max	2013-06-26 08:18:34 +0000
@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh" 

=== modified file 'Percona-Server/BUILD/compile-pentium64-max-sci'
--- Percona-Server/BUILD/compile-pentium64-max-sci	2010-12-28 18:57:23 +0000
+++ Percona-Server/BUILD/compile-pentium64-max-sci	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-ppc'
--- Percona-Server/BUILD/compile-ppc	2010-12-28 18:57:23 +0000
+++ Percona-Server/BUILD/compile-ppc	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-ppc-debug'
--- Percona-Server/BUILD/compile-ppc-debug	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-ppc-debug	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-ppc-debug-max'
--- Percona-Server/BUILD/compile-ppc-debug-max	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-ppc-debug-max	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-ppc-debug-max-no-ndb'
--- Percona-Server/BUILD/compile-ppc-debug-max-no-ndb	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-ppc-debug-max-no-ndb	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-ppc-max'
--- Percona-Server/BUILD/compile-ppc-max	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-ppc-max	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-solaris-amd64'
--- Percona-Server/BUILD/compile-solaris-amd64	2010-12-28 23:47:05 +0000
+++ Percona-Server/BUILD/compile-solaris-amd64	2013-06-26 08:18:34 +0000
@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 function _find_mysql_root () (
     while [ "x$PWD" != "x/" ]; do

=== modified file 'Percona-Server/BUILD/compile-solaris-amd64-debug'
--- Percona-Server/BUILD/compile-solaris-amd64-debug	2010-12-28 18:57:23 +0000
+++ Percona-Server/BUILD/compile-solaris-amd64-debug	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

=== modified file 'Percona-Server/BUILD/compile-solaris-sparc-debug'
--- Percona-Server/BUILD/compile-solaris-sparc-debug	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-solaris-sparc-debug	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 make -k clean || true
 /bin/rm -f */.deps/*.P config.cache

=== modified file 'Percona-Server/BUILD/compile-solaris-sparc-purify'
--- Percona-Server/BUILD/compile-solaris-sparc-purify	2013-02-26 05:35:17 +0000
+++ Percona-Server/BUILD/compile-solaris-sparc-purify	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 mode=""
 cxxfilt=""

=== modified file 'Percona-Server/CMakeLists.txt'
--- Percona-Server/CMakeLists.txt	2013-05-15 05:05:18 +0000
+++ Percona-Server/CMakeLists.txt	2013-06-26 08:18:34 +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
@@ -378,6 +378,7 @@
   SET(CPACK_GENERATOR "TGZ")
 ENDIF() 
 ADD_SUBDIRECTORY(packaging/WiX)
+ADD_SUBDIRECTORY(packaging/solaris)
 
 # Create a single package with "make package"
 # (see http://public.kitware.com/Bug/view.php?id=11452)

=== modified file 'Percona-Server/Docs/mysql.info'
--- Percona-Server/Docs/mysql.info	2012-08-20 00:29:22 +0000
+++ Percona-Server/Docs/mysql.info	2013-06-26 08:18:34 +0000
@@ -1,4 +1,3 @@
 
 The MySQL Reference Manual is available in various formats on
-http://dev.mysql.com/doc; if you're interested in the DocBook XML
-sources go to http://svn.mysql.com.
+http://dev.mysql.com/doc.

=== modified file 'Percona-Server/INSTALL-SOURCE'
--- Percona-Server/INSTALL-SOURCE	2012-09-17 13:08:32 +0000
+++ Percona-Server/INSTALL-SOURCE	2013-06-26 08:18:34 +0000
@@ -4,5 +4,4 @@
   http://dev.mysql.com/doc/refman/5.5/en/source-installation.html
 
 The MySQL Reference Manual is also available in various formats on
-http://dev.mysql.com/doc; if you're interested in the DocBook XML
-sources go to http://svn.mysql.com.
+http://dev.mysql.com/doc.

=== modified file 'Percona-Server/INSTALL-WIN-SOURCE'
--- Percona-Server/INSTALL-WIN-SOURCE	2012-09-17 13:08:32 +0000
+++ Percona-Server/INSTALL-WIN-SOURCE	2013-06-26 08:18:34 +0000
@@ -5,5 +5,4 @@
   http://dev.mysql.com/doc/refman/5.5/en/source-installation.html
 
 The MySQL Reference Manual is also available in various formats on
-http://dev.mysql.com/doc; if you're interested in the DocBook XML
-sources go to http://svn.mysql.com.
+http://dev.mysql.com/doc.

=== modified file 'Percona-Server/README'
--- Percona-Server/README	2013-01-01 02:36:10 +0000
+++ Percona-Server/README	2013-06-26 08:18:34 +0000
@@ -1,56 +1,56 @@
-MySQL Server 5.5
-
-This is a release of MySQL, a dual-license SQL database server.
-For the avoidance of doubt, this particular copy of the software 
-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.
-
-License information can be found in the COPYING file.
-
-MySQL FOSS License Exception
-We want free and open source software applications under certain
-licenses to be able to use specified GPL-licensed MySQL client
-libraries despite the fact that not all such FOSS licenses are
-compatible with version 2 of the GNU General Public License.  
-Therefore there are special exceptions to the terms and conditions 
-of the GPLv2 as applied to these client libraries, which are 
-identified and described in more detail in the FOSS License 
-Exception at 
-<http://www.mysql.com/about/legal/licensing/foss-exception.html>.
-
-This distribution may include materials developed by third
-parties. For license and attribution notices for these
-materials, please refer to the documentation that accompanies
-this distribution (see the "Licenses for Third-Party Components"
-appendix) or view the online documentation at 
-<http://dev.mysql.com/doc/>.
-
-GPLv2 Disclaimer
-For the avoidance of doubt, except that if any license choice
-other than GPL or LGPL is available it will apply instead, 
-Oracle elects to use only the General Public License version 2 
-(GPLv2) at this time for any software where a choice of GPL 
-license versions is made available with the language indicating 
-that GPLv2 or any later version may be used, or where a choice 
-of which version of the GPL is applied is otherwise unspecified.
-
-For further information about MySQL or additional documentation, 
-see:
-- The latest information about MySQL: http://www.mysql.com
-- The current MySQL documentation: http://dev.mysql.com/doc
-
-Some Reference Manual sections of special interest:
-- If you are migrating from an older version of MySQL, please 
-  read the "Upgrading from..." section.
-- To see what MySQL can do, take a look at the features section.
-- For installation instructions, see the Installing and Upgrading
-  chapter.
-- For the new features/bugfix history, see the MySQL Change History 
-  appendix.
-
-You can browse the MySQL Reference Manual online or download it 
-in any of several formats at the URL given earlier in this file.
-Source distributions include a local copy of the manual in the
-Docs directory.
+MySQL Server 5.5
+
+This is a release of MySQL, a dual-license SQL database server.
+For the avoidance of doubt, this particular copy of the software 
+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.
+
+License information can be found in the COPYING file.
+
+MySQL FOSS License Exception
+We want free and open source software applications under certain
+licenses to be able to use specified GPL-licensed MySQL client
+libraries despite the fact that not all such FOSS licenses are
+compatible with version 2 of the GNU General Public License.  
+Therefore there are special exceptions to the terms and conditions 
+of the GPLv2 as applied to these client libraries, which are 
+identified and described in more detail in the FOSS License 
+Exception at 
+<http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+
+This distribution may include materials developed by third
+parties. For license and attribution notices for these
+materials, please refer to the documentation that accompanies
+this distribution (see the "Licenses for Third-Party Components"
+appendix) or view the online documentation at 
+<http://dev.mysql.com/doc/>.
+
+GPLv2 Disclaimer
+For the avoidance of doubt, except that if any license choice
+other than GPL or LGPL is available it will apply instead, 
+Oracle elects to use only the General Public License version 2 
+(GPLv2) at this time for any software where a choice of GPL 
+license versions is made available with the language indicating 
+that GPLv2 or any later version may be used, or where a choice 
+of which version of the GPL is applied is otherwise unspecified.
+
+For further information about MySQL or additional documentation, 
+see:
+- The latest information about MySQL: http://www.mysql.com
+- The current MySQL documentation: http://dev.mysql.com/doc
+
+Some Reference Manual sections of special interest:
+- If you are migrating from an older version of MySQL, please 
+  read the "Upgrading from..." section.
+- To see what MySQL can do, take a look at the features section.
+- For installation instructions, see the Installing and Upgrading
+  chapter.
+- For the new features/bugfix history, see the MySQL Change History 
+  appendix.
+
+You can browse the MySQL Reference Manual online or download it 
+in any of several formats at the URL given earlier in this file.
+Source distributions include a local copy of the manual in the
+Docs directory.

=== modified file 'Percona-Server/VERSION'
--- Percona-Server/VERSION	2013-05-15 05:05:18 +0000
+++ Percona-Server/VERSION	2013-06-26 08:18:34 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=31
+MYSQL_VERSION_PATCH=32
 MYSQL_VERSION_EXTRA=

=== modified file 'Percona-Server/client/completion_hash.h'
--- Percona-Server/client/completion_hash.h	2013-02-26 05:35:17 +0000
+++ Percona-Server/client/completion_hash.h	2013-06-26 08:18:34 +0000
@@ -13,8 +13,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA */
 
 #ifndef _HASH_
 #define _HASH_

=== modified file 'Percona-Server/client/echo.c'
--- Percona-Server/client/echo.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/client/echo.c	2013-06-26 08:18:34 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /*
   echo is a replacement for the "echo" command builtin to cmd.exe

=== modified file 'Percona-Server/client/get_password.c'
--- Percona-Server/client/get_password.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/client/get_password.c	2013-06-26 08:18:34 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /*
 ** Ask for a password from tty

=== modified file 'Percona-Server/client/mysql.cc'
--- Percona-Server/client/mysql.cc	2013-06-12 05:29:59 +0000
+++ Percona-Server/client/mysql.cc	2013-06-26 08:18:34 +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
@@ -1861,7 +1861,7 @@
   String buffer;
 #endif
 
-  char	*line;
+  char	*line= NULL;
   char	in_string=0;
   ulong line_number=0;
   bool ml_comment= 0;  
@@ -1925,6 +1925,13 @@
 #else
       if (opt_outfile)
 	fputs(prompt, OUTFILE);
+      /*
+        free the previous entered line.
+        Note: my_free() cannot be used here as the memory was allocated under
+        the readline/libedit library.
+      */
+      if (line)
+        free(line);
       line= readline(prompt);
 #endif /* defined(__WIN__) */
 
@@ -1982,8 +1989,17 @@
 #if defined(__WIN__)
   buffer.free();
   tmpbuf.free();
+#else
+  if (interactive)
+    /*
+      free the last entered line.
+      Note: my_free() cannot be used here as the memory was allocated under
+      the readline/libedit library.
+    */
+    free(line);
 #endif
 
+
   return status.exit_status;
 }
 

=== modified file 'Percona-Server/client/mysql_plugin.c'
--- Percona-Server/client/mysql_plugin.c	2012-02-28 08:32:27 +0000
+++ Percona-Server/client/mysql_plugin.c	2013-06-26 08:18:34 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */
 
 #include <m_string.h>

=== modified file 'Percona-Server/client/mysql_upgrade.c'
--- Percona-Server/client/mysql_upgrade.c	2012-08-07 13:37:13 +0000
+++ Percona-Server/client/mysql_upgrade.c	2013-06-26 08:18:34 +0000
@@ -1,5 +1,5 @@
 /*
-   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
@@ -39,7 +39,7 @@
 static char mysqlcheck_path[FN_REFLEN];
 
 static my_bool opt_force, opt_verbose, debug_info_flag, debug_check_flag,
-               opt_systables_only;
+               opt_systables_only, opt_version_check;
 static uint my_end_arg= 0;
 static char *opt_user= (char*)"root";
 
@@ -128,6 +128,12 @@
    "Base name of shared memory.", 0,
    0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #endif
+  {"version-check", 'k', "Run this program only if its \'server version\' "
+   "matches the version of the server to which it's connecting, (enabled by "
+   "default); use --skip-version-check to avoid this check. Note: the \'server "
+   "version\' of the program is the version of the MySQL server with which it "
+   "was built/distributed.", &opt_version_check, &opt_version_check, 0,
+   GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
   {"socket", 'S', "The socket file to use for connection.",
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #include <sslopt-longopts.h>
@@ -283,6 +289,7 @@
             my_progname, optid == 'b' ? "basedir" : "datadir");
     /* FALLTHROUGH */
 
+  case 'k':                                     /* --version-check */
   case 'v': /* --verbose   */
   case 'f': /* --force     */
   case 's':                                     /* --upgrade-system-tables */
@@ -538,6 +545,8 @@
 static int extract_variable_from_show(DYNAMIC_STRING* ds, char* value)
 {
   char *value_start, *value_end;
+  size_t len;
+
   /*
     The query returns "datadir\t<datadir>\n", skip past
     the tab
@@ -550,7 +559,9 @@
   if ((value_end= strchr(value_start, '\n')) == NULL)
     return 1; /* Unexpected result */
 
-  strncpy(value, value_start, min(FN_REFLEN, value_end-value_start));
+  len= (size_t) min(FN_REFLEN, value_end-value_start);
+  strncpy(value, value_start, len);
+  value[len]= '\0';
   return 0;
 }
 
@@ -824,6 +835,55 @@
 };
 
 
+/* Convert the specified version string into the numeric format. */
+static ulong STDCALL calc_server_version(char *some_version)
+{
+  uint major, minor, version;
+  char *point= some_version, *end_point;
+  major=   (uint) strtoul(point, &end_point, 10);   point=end_point+1;
+  minor=   (uint) strtoul(point, &end_point, 10);   point=end_point+1;
+  version= (uint) strtoul(point, &end_point, 10);
+  return (ulong) major * 10000L + (ulong)(minor * 100 + version);
+}
+
+/**
+  Check if the server version matches with the server version mysql_upgrade
+  was compiled with.
+
+  @return 0 match successful
+          1 failed
+*/
+static int check_version_match(void)
+{
+  DYNAMIC_STRING ds_version;
+  char version_str[NAME_CHAR_LEN + 1];
+
+  if (init_dynamic_string(&ds_version, NULL, NAME_CHAR_LEN, NAME_CHAR_LEN))
+    die("Out of memory");
+
+  if (run_query("show variables like 'version'",
+                &ds_version, FALSE) ||
+      extract_variable_from_show(&ds_version, version_str))
+  {
+    dynstr_free(&ds_version);
+    return 1;                                   /* Query failed */
+  }
+
+  dynstr_free(&ds_version);
+
+  if (calc_server_version((char *) version_str) != MYSQL_VERSION_ID)
+  {
+    fprintf(stderr, "Error: Server version (%s) does not match with the "
+            "version of\nthe server (%s) with which this program was built/"
+            "distributed. You can\nuse --skip-version-check to skip this "
+            "check.\n", version_str, MYSQL_SERVER_VERSION);
+    return 1;
+  }
+  else
+    return 0;
+}
+
+
 int main(int argc, char **argv)
 {
   char self_name[FN_REFLEN];
@@ -888,6 +948,9 @@
     die(NULL);
   }
 
+  if (opt_version_check && check_version_match())
+    die("Upgrade failed");
+
   /*
     Run "mysqlcheck" and "mysql_fix_privilege_tables.sql"
   */

=== modified file 'Percona-Server/client/mysqladmin.cc'
--- Percona-Server/client/mysqladmin.cc	2012-08-07 13:37:13 +0000
+++ Percona-Server/client/mysqladmin.cc	2013-06-26 08:18:34 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /* maintaince of mysql databases */
 

=== modified file 'Percona-Server/client/mysqlbinlog.cc'
--- Percona-Server/client/mysqlbinlog.cc	2013-02-18 04:48:10 +0000
+++ Percona-Server/client/mysqlbinlog.cc	2013-06-26 08:18:34 +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
@@ -943,20 +943,41 @@
     case PRE_GA_DELETE_ROWS_EVENT:
     case PRE_GA_UPDATE_ROWS_EVENT:
     {
-      if (ev_type != TABLE_MAP_EVENT)
-      {
-        Rows_log_event *e= (Rows_log_event*) ev;
-        Table_map_log_event *ignored_map= 
-          print_event_info->m_table_map_ignored.get_table(e->get_table_id());
-        bool skip_event= (ignored_map != NULL);
-
-        /* 
-           end of statement check:
-             i) destroy/free ignored maps
-            ii) if skip event, flush cache now
-         */
-        if (e->get_flags(Rows_log_event::STMT_END_F))
-        {
+      bool stmt_end= FALSE;
+      Table_map_log_event *ignored_map= NULL;
+
+      if (ev_type == WRITE_ROWS_EVENT ||
+          ev_type == DELETE_ROWS_EVENT ||
+          ev_type == UPDATE_ROWS_EVENT)
+      {
+        Rows_log_event *new_ev= (Rows_log_event*) ev;
+        if (new_ev->get_flags(Rows_log_event::STMT_END_F))
+          stmt_end= TRUE;
+        ignored_map= print_event_info->m_table_map_ignored.get_table(new_ev->get_table_id());
+      }
+      else if (ev_type == PRE_GA_WRITE_ROWS_EVENT ||
+               ev_type == PRE_GA_DELETE_ROWS_EVENT ||
+               ev_type == PRE_GA_UPDATE_ROWS_EVENT)
+      {
+        Old_rows_log_event *old_ev= (Old_rows_log_event*) ev;
+        if (old_ev->get_flags(Rows_log_event::STMT_END_F))
+          stmt_end= TRUE;
+        ignored_map= print_event_info->m_table_map_ignored.get_table(old_ev->get_table_id());
+      }
+
+      bool skip_event= (ignored_map != NULL);
+      /*
+        end of statement check:
+        i) destroy/free ignored maps
+        ii) if skip event
+              a) since we are skipping the last event,
+                 append END-MARKER(') to body cache (if required)
+
+              b) flush cache now
+       */
+      if (stmt_end)
+      {
+
           /* 
             Now is safe to clear ignored map (clear_tables will also
             delete original table map events stored in the map).
@@ -974,6 +995,12 @@
           */
           if (skip_event)
           {
+            // append END-MARKER(') with delimiter
+            IO_CACHE *const body_cache= &print_event_info->body_cache;
+            if (my_b_tell(body_cache))
+              my_b_printf(body_cache, "'%s\n", print_event_info->delimiter);
+
+            // flush cache
             if ((copy_event_cache_to_file_and_reinit(&print_event_info->head_cache, result_file) ||
                 copy_event_cache_to_file_and_reinit(&print_event_info->body_cache, result_file)))
               goto err;
@@ -983,7 +1010,6 @@
         /* skip the event check */
         if (skip_event)
           goto end;
-      }
       /*
         These events must be printed in base64 format, if printed.
         base64 format requires a FD event to be safe, so if no FD

=== modified file 'Percona-Server/client/mysqldump.c'
--- Percona-Server/client/mysqldump.c	2013-06-01 15:04:43 +0000
+++ Percona-Server/client/mysqldump.c	2013-06-26 08:18:34 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 /* mysqldump.c  - Dump a tables contents and format to an ASCII file

=== modified file 'Percona-Server/client/mysqltest.cc'
--- Percona-Server/client/mysqltest.cc	2013-06-01 15:04:43 +0000
+++ Percona-Server/client/mysqltest.cc	2013-06-26 08:18:34 +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
@@ -3326,8 +3326,12 @@
   /* Set default wild chars for wild_compare, is changed in embedded mode */
   set_wild_chars(1);
   
+  uint length;
+  /* Storing the length of the path to the file, so it can be reused */
+  length= ds_file_to_remove.length;
   for (i= 0; i < (uint) dir_info->number_off_files; i++)
   {
+    ds_file_to_remove.length= length;
     file= dir_info->dir_entry + i;
     /* Remove only regular files, i.e. no directories etc. */
     /* if (!MY_S_ISREG(file->mystat->st_mode)) */
@@ -3337,8 +3341,10 @@
     if (ds_wild.length &&
         wild_compare(file->name, ds_wild.str, 0))
       continue;
-    ds_file_to_remove.length= ds_directory.length + 1;
-    ds_file_to_remove.str[ds_directory.length + 1]= 0;
+    /* Not required as the var ds_file_to_remove.length already has the
+       length in canonnicalized form */
+    /* ds_file_to_remove.length= ds_directory.length + 1;
+    ds_file_to_remove.str[ds_directory.length + 1]= 0; */
     dynstr_append(&ds_file_to_remove, file->name);
     DBUG_PRINT("info", ("removing file: %s", ds_file_to_remove.str));
     error= my_delete(ds_file_to_remove.str, MYF(0)) != 0;

=== modified file 'Percona-Server/client/sql_string.h'
--- Percona-Server/client/sql_string.h	2013-04-08 06:26:11 +0000
+++ Percona-Server/client/sql_string.h	2013-06-26 08:18:34 +0000
@@ -1,7 +1,7 @@
 #ifndef CLIENT_SQL_STRING_INCLUDED
 #define CLIENT_SQL_STRING_INCLUDED
 
-/* 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
@@ -231,6 +231,7 @@
       DBUG_ASSERT(!s.uses_buffer_owned_by(this));
       free();
       Ptr=s.Ptr ; str_length=s.str_length ; Alloced_length=s.Alloced_length;
+      str_charset=s.str_charset;
       alloced=0;
     }
     return *this;

=== modified file 'Percona-Server/cmake/package_name.cmake'
--- Percona-Server/cmake/package_name.cmake	2013-02-26 05:35:17 +0000
+++ Percona-Server/cmake/package_name.cmake	2013-06-26 08:18:34 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2012, 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
@@ -83,12 +83,20 @@
         MATH(EXPR VER  "${VER} -4")
         SET(DEFAULT_PLATFORM "osx10.${VER}")
       ENDIF()
-      LIST(LENGTH CMAKE_OSX_ARCHITECTURES LEN)
-      IF(LEN GREATER 1)
-        SET(DEFAULT_MACHINE "universal")
+
+      IF(CMAKE_OSX_ARCHITECTURES)
+        LIST(LENGTH CMAKE_OSX_ARCHITECTURES LEN)
+        IF(LEN GREATER 1)
+          SET(DEFAULT_MACHINE "universal")
+        ELSE()
+          SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}")
+        ENDIF()
       ELSE()
-        SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}")
+        IF(64BIT)
+          SET(DEFAULT_MACHINE "x86_64")
+        ENDIF()
       ENDIF()
+
       IF(DEFAULT_MACHINE MATCHES "i386")
         SET(DEFAULT_MACHINE "x86")
       ENDIF()

=== modified file 'Percona-Server/cmd-line-utils/readline/COPYING'
--- Percona-Server/cmd-line-utils/readline/COPYING	2003-01-18 16:53:46 +0000
+++ Percona-Server/cmd-line-utils/readline/COPYING	2013-06-26 08:18:34 +0000
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          59 Temple Place, Suite 330, Boston, MA 02111 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@
 
     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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 Also add information on how to contact you by electronic and paper mail.
 

=== modified file 'Percona-Server/cmd-line-utils/readline/ansi_stdlib.h'
--- Percona-Server/cmd-line-utils/readline/ansi_stdlib.h	2003-01-18 16:53:46 +0000
+++ Percona-Server/cmd-line-utils/readline/ansi_stdlib.h	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License along
    with Bash; see the file COPYING.  If not, write to the Free Software
-   Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #if !defined (_STDLIB_H_)
 #define	_STDLIB_H_ 1

=== modified file 'Percona-Server/cmd-line-utils/readline/bind.c'
--- Percona-Server/cmd-line-utils/readline/bind.c	2010-11-10 21:14:47 +0000
+++ Percona-Server/cmd-line-utils/readline/bind.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #define READLINE_LIBRARY
 

=== modified file 'Percona-Server/cmd-line-utils/readline/callback.c'
--- Percona-Server/cmd-line-utils/readline/callback.c	2008-01-03 13:26:41 +0000
+++ Percona-Server/cmd-line-utils/readline/callback.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/chardefs.h'
--- Percona-Server/cmd-line-utils/readline/chardefs.h	2009-06-06 13:05:44 +0000
+++ Percona-Server/cmd-line-utils/readline/chardefs.h	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #ifndef _CHARDEFS_H_
 #define _CHARDEFS_H_

=== modified file 'Percona-Server/cmd-line-utils/readline/compat.c'
--- Percona-Server/cmd-line-utils/readline/compat.c	2008-01-03 13:26:41 +0000
+++ Percona-Server/cmd-line-utils/readline/compat.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/complete.c'
--- Percona-Server/cmd-line-utils/readline/complete.c	2010-10-20 18:21:40 +0000
+++ Percona-Server/cmd-line-utils/readline/complete.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/configure.in'
--- Percona-Server/cmd-line-utils/readline/configure.in	2007-11-19 13:38:08 +0000
+++ Percona-Server/cmd-line-utils/readline/configure.in	2013-06-26 08:18:34 +0000
@@ -19,8 +19,8 @@
 
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 
 AC_REVISION([for Readline 5.2, version 2.61])
 

=== modified file 'Percona-Server/cmd-line-utils/readline/display.c'
--- Percona-Server/cmd-line-utils/readline/display.c	2009-09-23 13:21:29 +0000
+++ Percona-Server/cmd-line-utils/readline/display.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/emacs_keymap.c'
--- Percona-Server/cmd-line-utils/readline/emacs_keymap.c	2003-01-18 16:53:46 +0000
+++ Percona-Server/cmd-line-utils/readline/emacs_keymap.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #if !defined (BUFSIZ)
 #include <stdio.h>

=== modified file 'Percona-Server/cmd-line-utils/readline/funmap.c'
--- Percona-Server/cmd-line-utils/readline/funmap.c	2008-01-03 13:26:41 +0000
+++ Percona-Server/cmd-line-utils/readline/funmap.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/histexpand.c'
--- Percona-Server/cmd-line-utils/readline/histexpand.c	2010-10-20 18:21:40 +0000
+++ Percona-Server/cmd-line-utils/readline/histexpand.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #define READLINE_LIBRARY
 

=== modified file 'Percona-Server/cmd-line-utils/readline/histfile.c'
--- Percona-Server/cmd-line-utils/readline/histfile.c	2010-10-20 18:21:40 +0000
+++ Percona-Server/cmd-line-utils/readline/histfile.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 /* The goal is to make the implementation transparent, so that you
    don't have to know what data types are used, just what functions

=== modified file 'Percona-Server/cmd-line-utils/readline/histlib.h'
--- Percona-Server/cmd-line-utils/readline/histlib.h	2003-01-18 16:53:46 +0000
+++ Percona-Server/cmd-line-utils/readline/histlib.h	2013-06-26 08:18:34 +0000
@@ -17,7 +17,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #if !defined (_HISTLIB_H_)
 #define _HISTLIB_H_

=== modified file 'Percona-Server/cmd-line-utils/readline/history.c'
--- Percona-Server/cmd-line-utils/readline/history.c	2008-01-03 13:26:41 +0000
+++ Percona-Server/cmd-line-utils/readline/history.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 /* The goal is to make the implementation transparent, so that you
    don't have to know what data types are used, just what functions

=== modified file 'Percona-Server/cmd-line-utils/readline/history.h'
--- Percona-Server/cmd-line-utils/readline/history.h	2009-06-29 13:17:01 +0000
+++ Percona-Server/cmd-line-utils/readline/history.h	2013-06-26 08:18:34 +0000
@@ -17,7 +17,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #ifndef _HISTORY_H_
 #define _HISTORY_H_

=== modified file 'Percona-Server/cmd-line-utils/readline/histsearch.c'
--- Percona-Server/cmd-line-utils/readline/histsearch.c	2008-01-03 13:26:41 +0000
+++ Percona-Server/cmd-line-utils/readline/histsearch.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #define READLINE_LIBRARY
 

=== modified file 'Percona-Server/cmd-line-utils/readline/input.c'
--- Percona-Server/cmd-line-utils/readline/input.c	2010-07-02 19:38:04 +0000
+++ Percona-Server/cmd-line-utils/readline/input.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (__TANDEM)

=== modified file 'Percona-Server/cmd-line-utils/readline/isearch.c'
--- Percona-Server/cmd-line-utils/readline/isearch.c	2010-10-20 18:21:40 +0000
+++ Percona-Server/cmd-line-utils/readline/isearch.c	2013-06-26 08:18:34 +0000
@@ -23,7 +23,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/keymaps.c'
--- Percona-Server/cmd-line-utils/readline/keymaps.c	2008-01-03 13:26:41 +0000
+++ Percona-Server/cmd-line-utils/readline/keymaps.c	2013-06-26 08:18:34 +0000
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Readline; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/keymaps.h'
--- Percona-Server/cmd-line-utils/readline/keymaps.h	2003-01-18 16:53:46 +0000
+++ Percona-Server/cmd-line-utils/readline/keymaps.h	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #ifndef _KEYMAPS_H_
 #define _KEYMAPS_H_

=== modified file 'Percona-Server/cmd-line-utils/readline/kill.c'
--- Percona-Server/cmd-line-utils/readline/kill.c	2009-06-29 13:17:01 +0000
+++ Percona-Server/cmd-line-utils/readline/kill.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/macro.c'
--- Percona-Server/cmd-line-utils/readline/macro.c	2009-06-29 13:17:01 +0000
+++ Percona-Server/cmd-line-utils/readline/macro.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/mbutil.c'
--- Percona-Server/cmd-line-utils/readline/mbutil.c	2009-06-29 13:17:01 +0000
+++ Percona-Server/cmd-line-utils/readline/mbutil.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/misc.c'
--- Percona-Server/cmd-line-utils/readline/misc.c	2009-06-29 13:17:01 +0000
+++ Percona-Server/cmd-line-utils/readline/misc.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/nls.c'
--- Percona-Server/cmd-line-utils/readline/nls.c	2009-06-29 13:17:01 +0000
+++ Percona-Server/cmd-line-utils/readline/nls.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/parens.c'
--- Percona-Server/cmd-line-utils/readline/parens.c	2010-10-20 18:21:40 +0000
+++ Percona-Server/cmd-line-utils/readline/parens.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (__TANDEM)

=== modified file 'Percona-Server/cmd-line-utils/readline/posixdir.h'
--- Percona-Server/cmd-line-utils/readline/posixdir.h	2005-07-19 00:22:38 +0000
+++ Percona-Server/cmd-line-utils/readline/posixdir.h	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Bash; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 /* This file should be included instead of <dirent.h> or <sys/dir.h>. */
 

=== modified file 'Percona-Server/cmd-line-utils/readline/posixjmp.h'
--- Percona-Server/cmd-line-utils/readline/posixjmp.h	2003-01-18 16:53:46 +0000
+++ Percona-Server/cmd-line-utils/readline/posixjmp.h	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Bash; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #ifndef _POSIXJMP_H_
 #define _POSIXJMP_H_

=== modified file 'Percona-Server/cmd-line-utils/readline/posixstat.h'
--- Percona-Server/cmd-line-utils/readline/posixstat.h	2003-01-18 16:53:46 +0000
+++ Percona-Server/cmd-line-utils/readline/posixstat.h	2013-06-26 08:18:34 +0000
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Bash; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 /* This file should be included instead of <sys/stat.h>.
    It relies on the local sys/stat.h to work though. */

=== modified file 'Percona-Server/cmd-line-utils/readline/readline.c'
--- Percona-Server/cmd-line-utils/readline/readline.c	2010-10-20 18:21:40 +0000
+++ Percona-Server/cmd-line-utils/readline/readline.c	2013-06-26 08:18:34 +0000
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/readline.h'
--- Percona-Server/cmd-line-utils/readline/readline.h	2009-06-29 13:17:01 +0000
+++ Percona-Server/cmd-line-utils/readline/readline.h	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #if !defined (_READLINE_H_)
 #define _READLINE_H_

=== modified file 'Percona-Server/cmd-line-utils/readline/rlconf.h'
--- Percona-Server/cmd-line-utils/readline/rlconf.h	2007-11-19 13:38:08 +0000
+++ Percona-Server/cmd-line-utils/readline/rlconf.h	2013-06-26 08:18:34 +0000
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #if !defined (_RLCONF_H_)
 #define _RLCONF_H_

=== modified file 'Percona-Server/cmd-line-utils/readline/rldefs.h'
--- Percona-Server/cmd-line-utils/readline/rldefs.h	2008-01-03 13:26:41 +0000
+++ Percona-Server/cmd-line-utils/readline/rldefs.h	2013-06-26 08:18:34 +0000
@@ -21,7 +21,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #if !defined (_RLDEFS_H_)
 #define _RLDEFS_H_

=== modified file 'Percona-Server/cmd-line-utils/readline/rlmbutil.h'
--- Percona-Server/cmd-line-utils/readline/rlmbutil.h	2010-02-22 13:23:47 +0000
+++ Percona-Server/cmd-line-utils/readline/rlmbutil.h	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #if !defined (_RL_MBUTIL_H_)
 #define _RL_MBUTIL_H_

=== modified file 'Percona-Server/cmd-line-utils/readline/rlprivate.h'
--- Percona-Server/cmd-line-utils/readline/rlprivate.h	2009-06-29 13:17:01 +0000
+++ Percona-Server/cmd-line-utils/readline/rlprivate.h	2013-06-26 08:18:34 +0000
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #if !defined (_RL_PRIVATE_H_)
 #define _RL_PRIVATE_H_

=== modified file 'Percona-Server/cmd-line-utils/readline/rlshell.h'
--- Percona-Server/cmd-line-utils/readline/rlshell.h	2003-01-18 16:53:46 +0000
+++ Percona-Server/cmd-line-utils/readline/rlshell.h	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #if !defined (_RL_SHELL_H_)
 #define _RL_SHELL_H_

=== modified file 'Percona-Server/cmd-line-utils/readline/rlstdc.h'
--- Percona-Server/cmd-line-utils/readline/rlstdc.h	2005-07-19 00:22:38 +0000
+++ Percona-Server/cmd-line-utils/readline/rlstdc.h	2013-06-26 08:18:34 +0000
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Bash; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #if !defined (_RL_STDC_H_)
 #define _RL_STDC_H_

=== modified file 'Percona-Server/cmd-line-utils/readline/rltty.c'
--- Percona-Server/cmd-line-utils/readline/rltty.c	2009-06-29 14:00:47 +0000
+++ Percona-Server/cmd-line-utils/readline/rltty.c	2013-06-26 08:18:34 +0000
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/rltty.h'
--- Percona-Server/cmd-line-utils/readline/rltty.h	2005-07-19 00:22:38 +0000
+++ Percona-Server/cmd-line-utils/readline/rltty.h	2013-06-26 08:18:34 +0000
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #if !defined (_RLTTY_H_)
 #define _RLTTY_H_

=== modified file 'Percona-Server/cmd-line-utils/readline/rltypedefs.h'
--- Percona-Server/cmd-line-utils/readline/rltypedefs.h	2005-07-19 00:22:38 +0000
+++ Percona-Server/cmd-line-utils/readline/rltypedefs.h	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #ifndef _RL_TYPEDEFS_H_
 #define _RL_TYPEDEFS_H_

=== modified file 'Percona-Server/cmd-line-utils/readline/rlwinsize.h'
--- Percona-Server/cmd-line-utils/readline/rlwinsize.h	2008-01-03 13:26:41 +0000
+++ Percona-Server/cmd-line-utils/readline/rlwinsize.h	2013-06-26 08:18:34 +0000
@@ -20,7 +20,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #if !defined (_RLWINSIZE_H_)
 #define _RLWINSIZE_H_

=== modified file 'Percona-Server/cmd-line-utils/readline/savestring.c'
--- Percona-Server/cmd-line-utils/readline/savestring.c	2008-01-03 13:26:41 +0000
+++ Percona-Server/cmd-line-utils/readline/savestring.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #include "config_readline.h"

=== modified file 'Percona-Server/cmd-line-utils/readline/search.c'
--- Percona-Server/cmd-line-utils/readline/search.c	2009-06-29 13:17:01 +0000
+++ Percona-Server/cmd-line-utils/readline/search.c	2013-06-26 08:18:34 +0000
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/shell.c'
--- Percona-Server/cmd-line-utils/readline/shell.c	2008-01-03 13:26:41 +0000
+++ Percona-Server/cmd-line-utils/readline/shell.c	2013-06-26 08:18:34 +0000
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/signals.c'
--- Percona-Server/cmd-line-utils/readline/signals.c	2008-01-03 13:26:41 +0000
+++ Percona-Server/cmd-line-utils/readline/signals.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/tcap.h'
--- Percona-Server/cmd-line-utils/readline/tcap.h	2008-01-03 13:26:41 +0000
+++ Percona-Server/cmd-line-utils/readline/tcap.h	2013-06-26 08:18:34 +0000
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #if !defined (_RLTCAP_H_)
 #define _RLTCAP_H_

=== modified file 'Percona-Server/cmd-line-utils/readline/terminal.c'
--- Percona-Server/cmd-line-utils/readline/terminal.c	2010-10-19 13:49:31 +0000
+++ Percona-Server/cmd-line-utils/readline/terminal.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/text.c'
--- Percona-Server/cmd-line-utils/readline/text.c	2010-10-20 18:21:40 +0000
+++ Percona-Server/cmd-line-utils/readline/text.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/tilde.c'
--- Percona-Server/cmd-line-utils/readline/tilde.c	2009-06-29 13:17:01 +0000
+++ Percona-Server/cmd-line-utils/readline/tilde.c	2013-06-26 08:18:34 +0000
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Readline; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #if defined (HAVE_CONFIG_H)
 #  include "config_readline.h"

=== modified file 'Percona-Server/cmd-line-utils/readline/tilde.h'
--- Percona-Server/cmd-line-utils/readline/tilde.h	2007-11-19 13:38:08 +0000
+++ Percona-Server/cmd-line-utils/readline/tilde.h	2013-06-26 08:18:34 +0000
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #if !defined (_TILDE_H_)
 #  define _TILDE_H_

=== modified file 'Percona-Server/cmd-line-utils/readline/undo.c'
--- Percona-Server/cmd-line-utils/readline/undo.c	2009-08-28 16:21:54 +0000
+++ Percona-Server/cmd-line-utils/readline/undo.c	2013-06-26 08:18:34 +0000
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/util.c'
--- Percona-Server/cmd-line-utils/readline/util.c	2009-10-16 18:19:36 +0000
+++ Percona-Server/cmd-line-utils/readline/util.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/vi_keymap.c'
--- Percona-Server/cmd-line-utils/readline/vi_keymap.c	2007-11-19 13:38:08 +0000
+++ Percona-Server/cmd-line-utils/readline/vi_keymap.c	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #if !defined (BUFSIZ)
 #include <stdio.h>

=== modified file 'Percona-Server/cmd-line-utils/readline/vi_mode.c'
--- Percona-Server/cmd-line-utils/readline/vi_mode.c	2009-06-29 13:17:01 +0000
+++ Percona-Server/cmd-line-utils/readline/vi_mode.c	2013-06-26 08:18:34 +0000
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 /* **************************************************************** */

=== modified file 'Percona-Server/cmd-line-utils/readline/xmalloc.c'
--- Percona-Server/cmd-line-utils/readline/xmalloc.c	2008-01-23 16:43:46 +0000
+++ Percona-Server/cmd-line-utils/readline/xmalloc.c	2013-06-26 08:18:34 +0000
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Readline; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)

=== modified file 'Percona-Server/cmd-line-utils/readline/xmalloc.h'
--- Percona-Server/cmd-line-utils/readline/xmalloc.h	2003-01-18 16:53:46 +0000
+++ Percona-Server/cmd-line-utils/readline/xmalloc.h	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
 
 #if !defined (_XMALLOC_H_)
 #define _XMALLOC_H_

=== modified file 'Percona-Server/configure.cmake'
--- Percona-Server/configure.cmake	2013-05-15 05:05:18 +0000
+++ Percona-Server/configure.cmake	2013-06-26 08:18:34 +0000
@@ -1,5 +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
@@ -603,6 +602,7 @@
 
 # check whether time_t is unsigned
 CHECK_C_SOURCE_COMPILES("
+#include <time.h>
 int main()
 {
   int array[(((time_t)-1) > 0) ? 1 : -1];

=== modified file 'Percona-Server/dbug/dbug.c'
--- Percona-Server/dbug/dbug.c	2012-09-18 15:32:02 +0000
+++ Percona-Server/dbug/dbug.c	2013-06-26 08:18:34 +0000
@@ -919,7 +919,7 @@
       } while (0)
 #define str_to_buf(S)    do {                   \
         char_to_buf(',');                       \
-        buf=strnmov(buf, (S), len+1);           \
+        buf=strnmov(buf, (S), end-buf);         \
         if (buf >= end) goto overflow;          \
       } while (0)
 #define list_to_buf(l, f)  do {                 \

=== modified file 'Percona-Server/extra/charset2html.c'
--- Percona-Server/extra/charset2html.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/extra/charset2html.c	2013-06-26 08:18:34 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA 
  */
 
 /*

=== modified file 'Percona-Server/extra/yassl/COPYING'
--- Percona-Server/extra/yassl/COPYING	2006-08-01 18:20:46 +0000
+++ Percona-Server/extra/yassl/COPYING	2013-06-26 08:18:34 +0000
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@
 
     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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 
 Also add information on how to contact you by electronic and paper mail.

=== modified file 'Percona-Server/extra/yassl/include/openssl/generate_prefix_files.pl'
--- Percona-Server/extra/yassl/include/openssl/generate_prefix_files.pl	2010-12-28 18:57:23 +0000
+++ Percona-Server/extra/yassl/include/openssl/generate_prefix_files.pl	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 #
 # This script generates defines for all functions

=== modified file 'Percona-Server/extra/yassl/src/make.bat'
--- Percona-Server/extra/yassl/src/make.bat	2013-02-25 14:26:00 +0000
+++ Percona-Server/extra/yassl/src/make.bat	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 REM 
 REM You should have received a copy of the GNU General Public License
 REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 REM quick and dirty build file for testing different MSDEVs
 setlocal 

=== modified file 'Percona-Server/extra/yassl/taocrypt/COPYING'
--- Percona-Server/extra/yassl/taocrypt/COPYING	2006-09-25 14:40:29 +0000
+++ Percona-Server/extra/yassl/taocrypt/COPYING	2013-06-26 08:18:34 +0000
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@
 
     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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 
 Also add information on how to contact you by electronic and paper mail.

=== modified file 'Percona-Server/extra/yassl/taocrypt/benchmark/make.bat'
--- Percona-Server/extra/yassl/taocrypt/benchmark/make.bat	2013-02-25 14:26:00 +0000
+++ Percona-Server/extra/yassl/taocrypt/benchmark/make.bat	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 REM 
 REM You should have received a copy of the GNU General Public License
 REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 REM quick and dirty build file for testing different MSDEVs
 setlocal 

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/make.bat'
--- Percona-Server/extra/yassl/taocrypt/src/make.bat	2013-02-25 14:26:00 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/make.bat	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 REM 
 REM You should have received a copy of the GNU General Public License
 REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 REM quick and dirty build file for testing different MSDEVs
 setlocal 

=== modified file 'Percona-Server/extra/yassl/taocrypt/test/make.bat'
--- Percona-Server/extra/yassl/taocrypt/test/make.bat	2013-02-25 14:26:00 +0000
+++ Percona-Server/extra/yassl/taocrypt/test/make.bat	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 REM 
 REM You should have received a copy of the GNU General Public License
 REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 REM quick and dirty build file for testing different MSDEVs
 setlocal 

=== modified file 'Percona-Server/extra/yassl/testsuite/make.bat'
--- Percona-Server/extra/yassl/testsuite/make.bat	2013-02-25 14:26:00 +0000
+++ Percona-Server/extra/yassl/testsuite/make.bat	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 REM 
 REM You should have received a copy of the GNU General Public License
 REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 REM quick and dirty build file for testing different MSDEVs
 setlocal 

=== modified file 'Percona-Server/include/base64.h'
--- Percona-Server/include/base64.h	2013-02-26 05:35:17 +0000
+++ Percona-Server/include/base64.h	2013-06-26 08:18:34 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #ifndef __BASE64_H_INCLUDED__
 #define __BASE64_H_INCLUDED__

=== modified file 'Percona-Server/include/my_bitmap.h'
--- Percona-Server/include/my_bitmap.h	2011-07-03 23:48:19 +0000
+++ Percona-Server/include/my_bitmap.h	2013-06-26 08:18:34 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #ifndef _my_bitmap_h_
 #define _my_bitmap_h_

=== modified file 'Percona-Server/include/my_compare.h'
--- Percona-Server/include/my_compare.h	2011-03-29 12:43:49 +0000
+++ Percona-Server/include/my_compare.h	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #ifndef _my_compare_h
 #define _my_compare_h

=== modified file 'Percona-Server/include/my_global.h'
--- Percona-Server/include/my_global.h	2012-02-16 09:48:16 +0000
+++ Percona-Server/include/my_global.h	2013-06-26 08:18:34 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /* This is the include file that should be included 'first' in every C file. */
 

=== modified file 'Percona-Server/include/my_md5.h'
--- Percona-Server/include/my_md5.h	2013-02-26 05:35:17 +0000
+++ Percona-Server/include/my_md5.h	2013-06-26 08:18:34 +0000
@@ -15,7 +15,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /* See md5.c for explanation and copyright information.  */
 

=== modified file 'Percona-Server/include/my_net.h'
--- Percona-Server/include/my_net.h	2013-02-26 05:35:17 +0000
+++ Percona-Server/include/my_net.h	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /*
   This file is also used to make handling of sockets and ioctl()

=== modified file 'Percona-Server/include/my_pthread.h'
--- Percona-Server/include/my_pthread.h	2011-03-08 17:39:25 +0000
+++ Percona-Server/include/my_pthread.h	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /* Defines to make different thread packages compatible */
 

=== modified file 'Percona-Server/include/my_sys.h'
--- Percona-Server/include/my_sys.h	2013-05-23 08:39:28 +0000
+++ Percona-Server/include/my_sys.h	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #ifndef _my_sys_h
 #define _my_sys_h

=== modified file 'Percona-Server/include/my_user.h'
--- Percona-Server/include/my_user.h	2013-02-26 05:35:17 +0000
+++ Percona-Server/include/my_user.h	2013-06-26 08:18:34 +0000
@@ -12,7 +12,7 @@
 
  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /*
   This is a header for libraries containing functions used in both server and

=== modified file 'Percona-Server/include/my_xml.h'
--- Percona-Server/include/my_xml.h	2013-02-26 05:35:17 +0000
+++ Percona-Server/include/my_xml.h	2013-06-26 08:18:34 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA  */
 
 
 #ifndef _my_xml_h

=== modified file 'Percona-Server/include/mysql/innodb_priv.h'
--- Percona-Server/include/mysql/innodb_priv.h	2010-11-22 14:08:51 +0000
+++ Percona-Server/include/mysql/innodb_priv.h	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #ifndef INNODB_PRIV_INCLUDED
 #define INNODB_PRIV_INCLUDED

=== modified file 'Percona-Server/include/mysql_time.h'
--- Percona-Server/include/mysql_time.h	2013-02-26 05:35:17 +0000
+++ Percona-Server/include/mysql_time.h	2013-06-26 08:18:34 +0000
@@ -12,7 +12,7 @@
 
  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #ifndef _mysql_time_h_
 #define _mysql_time_h_

=== modified file 'Percona-Server/include/t_ctype.h'
--- Percona-Server/include/t_ctype.h	2006-12-23 19:17:15 +0000
+++ Percona-Server/include/t_ctype.h	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /*
   Copyright (C) 1998, 1999 by Pruet Boonma, all rights reserved.

=== modified file 'Percona-Server/include/typelib.h'
--- Percona-Server/include/typelib.h	2013-02-26 05:35:17 +0000
+++ Percona-Server/include/typelib.h	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 
 #ifndef _typelib_h

=== modified file 'Percona-Server/libmysql/authentication_win/common.cc'
--- Percona-Server/libmysql/authentication_win/common.cc	2011-09-07 18:02:35 +0000
+++ Percona-Server/libmysql/authentication_win/common.cc	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include "common.h"
 #include <sddl.h>   // for ConvertSidToStringSid()

=== modified file 'Percona-Server/libmysql/authentication_win/common.h'
--- Percona-Server/libmysql/authentication_win/common.h	2011-09-07 18:02:35 +0000
+++ Percona-Server/libmysql/authentication_win/common.h	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #ifndef COMMON_H
 #define COMMON_H

=== modified file 'Percona-Server/libmysql/authentication_win/handshake.cc'
--- Percona-Server/libmysql/authentication_win/handshake.cc	2011-04-28 19:39:42 +0000
+++ Percona-Server/libmysql/authentication_win/handshake.cc	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include "handshake.h"
 

=== modified file 'Percona-Server/libmysql/authentication_win/handshake.h'
--- Percona-Server/libmysql/authentication_win/handshake.h	2011-04-28 19:39:42 +0000
+++ Percona-Server/libmysql/authentication_win/handshake.h	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #ifndef HANDSHAKE_H
 #define HANDSHAKE_H

=== modified file 'Percona-Server/libmysql/authentication_win/handshake_client.cc'
--- Percona-Server/libmysql/authentication_win/handshake_client.cc	2011-10-19 11:39:43 +0000
+++ Percona-Server/libmysql/authentication_win/handshake_client.cc	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include "handshake.h"
 

=== modified file 'Percona-Server/libmysql/authentication_win/log_client.cc'
--- Percona-Server/libmysql/authentication_win/log_client.cc	2011-09-07 18:02:35 +0000
+++ Percona-Server/libmysql/authentication_win/log_client.cc	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include <my_global.h>
 #include "common.h"

=== modified file 'Percona-Server/libmysql/authentication_win/plugin_client.cc'
--- Percona-Server/libmysql/authentication_win/plugin_client.cc	2011-06-03 11:44:33 +0000
+++ Percona-Server/libmysql/authentication_win/plugin_client.cc	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include <my_global.h>
 #include <mysql.h>

=== modified file 'Percona-Server/libmysql/conf_to_src.c'
--- Percona-Server/libmysql/conf_to_src.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/libmysql/conf_to_src.c	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /* can't use -lmysys because this prog is used to create -lstrings */
 

=== modified file 'Percona-Server/libmysqld/examples/test-run'
--- Percona-Server/libmysqld/examples/test-run	2010-12-28 18:57:23 +0000
+++ Percona-Server/libmysqld/examples/test-run	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 # This is slapped together as a quick way to run the tests and
 # is not meant for prime time.  Please hack at it and submit

=== modified file 'Percona-Server/mysql-test/include/have_perfschema.inc'
--- Percona-Server/mysql-test/include/have_perfschema.inc	2010-01-07 05:42:07 +0000
+++ Percona-Server/mysql-test/include/have_perfschema.inc	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 if (!`SELECT count(*) FROM information_schema.engines WHERE
       (support = 'YES' OR support = 'DEFAULT') AND

=== added file 'Percona-Server/mysql-test/include/install_semisync.inc'
--- Percona-Server/mysql-test/include/install_semisync.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/install_semisync.inc	2013-06-26 08:18:34 +0000
@@ -0,0 +1,39 @@
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+#
+--let $include_filename= install_semisync.inc
+--source include/begin_include_file.inc
+
+--source include/not_embedded.inc
+--source include/have_semisync_plugin.inc
+
+--connection master
+
+--disable_query_log
+--let $value = query_get_value(show variables like 'rpl_semi_sync_master_enabled', Value, 1)
+if ($value == No such row)
+{
+    SET sql_log_bin = 0;
+    eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
+    SET GLOBAL rpl_semi_sync_master_enabled = 1;
+    SET sql_log_bin = 1;
+}
+--enable_query_log
+
+--connection slave
+--source include/stop_slave_io.inc
+
+--disable_query_log
+--let $value= query_get_value(show variables like 'rpl_semi_sync_slave_enabled', Value, 1)
+if ($value == No such row)
+{
+    SET sql_log_bin = 0;
+    eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN';
+    SET GLOBAL rpl_semi_sync_slave_enabled = 1;
+    SET sql_log_bin = 1;
+}
+START SLAVE IO_THREAD;
+--source include/wait_for_slave_io_to_start.inc
+--enable_query_log
+
+--source include/end_include_file.inc

=== added file 'Percona-Server/mysql-test/include/uninstall_semisync.inc'
--- Percona-Server/mysql-test/include/uninstall_semisync.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/uninstall_semisync.inc	2013-06-26 08:18:34 +0000
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+#
+--let $include_filename= uninstall_semisync.inc
+--source include/begin_include_file.inc
+
+--disable_query_log
+--connection slave
+--source include/stop_slave_io.inc
+
+# Uninstall rpl_semi_sync_slave first
+--disable_warnings
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+
+--connection master
+UNINSTALL PLUGIN rpl_semi_sync_master;
+--enable_warnings
+
+--connection slave
+START SLAVE IO_THREAD;
+--source include/wait_for_slave_io_to_start.inc
+--enable_query_log
+
+--source include/end_include_file.inc

=== modified file 'Percona-Server/mysql-test/lib/My/CoreDump.pm'
--- Percona-Server/mysql-test/lib/My/CoreDump.pm	2011-10-05 13:16:20 +0000
+++ Percona-Server/mysql-test/lib/My/CoreDump.pm	2013-06-26 08:18:34 +0000
@@ -1,5 +1,5 @@
 # -*- cperl -*-
-# 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
@@ -255,13 +255,17 @@
 
 
 sub show {
-  my ($class, $core_name, $exe_mysqld)= @_;
+  my ($class, $core_name, $exe_mysqld, $parallel)= @_;
   $hint_mysqld= $exe_mysqld;
 
   # On Windows, rely on cdb to be there...
   if (IS_WINDOWS)
   {
-    _cdb($core_name);
+    # Starting cdb is unsafe when used with --parallel > 1 option 
+    if ( $parallel < 2 )
+    {
+      _cdb($core_name);
+    }
     return;
   }
   

=== modified file 'Percona-Server/mysql-test/lib/My/SafeProcess/CMakeLists.txt'
--- Percona-Server/mysql-test/lib/My/SafeProcess/CMakeLists.txt	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysql-test/lib/My/SafeProcess/CMakeLists.txt	2013-06-26 08:18:34 +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
@@ -13,6 +13,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
+IF (NOT INSTALL_MYSQLTESTDIR)
+  RETURN()
+ENDIF()
+
 SET(INSTALL_ARGS 
   DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" 
   COMPONENT Test
@@ -25,8 +29,16 @@
   MYSQL_ADD_EXECUTABLE(my_safe_process safe_process.cc ${INSTALL_ARGS})
 ENDIF()
 
-INSTALL(TARGETS my_safe_process DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test)
+INSTALL(TARGETS my_safe_process
+  DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test
+)
+
 IF(WIN32)
-  INSTALL(TARGETS my_safe_kill DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test)
+  INSTALL(TARGETS my_safe_kill
+    DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test
+  )
 ENDIF()
-INSTALL(FILES Base.pm DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test)
+
+INSTALL(FILES Base.pm
+  DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test
+)

=== modified file 'Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc'
--- Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc	2013-05-23 08:39:28 +0000
+++ Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 
 /*

=== modified file 'Percona-Server/mysql-test/lib/My/SysInfo.pm'
--- Percona-Server/mysql-test/lib/My/SysInfo.pm	2011-06-30 15:37:13 +0000
+++ Percona-Server/mysql-test/lib/My/SysInfo.pm	2013-06-26 08:18:34 +0000
@@ -1,5 +1,5 @@
 # -*- cperl -*-
-# Copyright (c) 2008 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2013 MySQL AB, 2008 Sun Microsystems, Inc.
 # Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -60,7 +60,7 @@
     }
 
     # Make sure bogomips is set to some value
-    $cpuinfo->{bogomips} |= DEFAULT_BOGO_MIPS;
+    $cpuinfo->{bogomips} ||= DEFAULT_BOGO_MIPS;
 
     # Cpus reported once, but with 'cpu_count' set to the actual number
     my $cpu_count= $cpuinfo->{cpu_count} || 1;

=== modified file 'Percona-Server/mysql-test/lib/v1/mysql-test-run.pl'
--- Percona-Server/mysql-test/lib/v1/mysql-test-run.pl	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysql-test/lib/v1/mysql-test-run.pl	2013-06-26 08:18:34 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# 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
@@ -133,7 +133,6 @@
 our $path_snapshot;
 our $path_mysqltest_log;
 our $path_current_test_log;
-our $path_my_basedir;
 
 our $opt_vardir;                 # A path but set directly on cmd line
 our $path_vardir_trace;          # unix formatted opt_vardir for trace files
@@ -764,8 +763,6 @@
   $glob_mysql_bench_dir= undef
     unless -d $glob_mysql_bench_dir;
 
-  $path_my_basedir=
-    $source_dist ? $glob_mysql_test_dir : $glob_basedir;
 
   $glob_timers= mtr_init_timers();
 
@@ -3125,7 +3122,7 @@
   mtr_init_args(\$args);
   mtr_add_arg($args, "--no-defaults");
   mtr_add_arg($args, "--bootstrap");
-  mtr_add_arg($args, "--basedir=%s", $path_my_basedir);
+  mtr_add_arg($args, "--basedir=%s", $glob_basedir);
   mtr_add_arg($args, "--datadir=%s", $data_dir);
   mtr_add_arg($args, "--loose-skip-ndbcluster");
   mtr_add_arg($args, "--tmpdir=.");
@@ -3275,7 +3272,7 @@
 log-error           = $instance->{path_datadir}/mysqld$server_id.err.log
 log-slow-queries    = $instance->{path_datadir}/mysqld$server_id.slow.log
 character-sets-dir  = $path_charsetsdir
-basedir             = $path_my_basedir
+basedir             = $glob_basedir
 server_id           = $server_id
 shutdown-delay      = 10
 skip-stack-trace
@@ -3866,7 +3863,7 @@
 
   mtr_add_arg($args, "%s--no-defaults", $prefix);
 
-  mtr_add_arg($args, "%s--basedir=%s", $prefix, $path_my_basedir);
+  mtr_add_arg($args, "%s--basedir=%s", $prefix, $glob_basedir);
   mtr_add_arg($args, "%s--character-sets-dir=%s", $prefix, $path_charsetsdir);
 
   if ( $mysql_version_id >= 50036)

=== modified file 'Percona-Server/mysql-test/mysql-test-run.pl'
--- Percona-Server/mysql-test/mysql-test-run.pl	2013-05-23 08:39:28 +0000
+++ Percona-Server/mysql-test/mysql-test-run.pl	2013-06-26 08:18:34 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 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
@@ -644,7 +644,7 @@
 			   mtr_report(" - found '$core_name'",
 				      "($num_saved_cores/$opt_max_save_core)");
 
-			   My::CoreDump->show($core_file, $exe_mysqld);
+			   My::CoreDump->show($core_file, $exe_mysqld, $opt_parallel);
 
 			   if ($num_saved_cores >= $opt_max_save_core) {
 			     mtr_report(" - deleting it, already saved",

=== modified file 'Percona-Server/mysql-test/purify.supp'
--- Percona-Server/mysql-test/purify.supp	2010-12-28 18:57:23 +0000
+++ Percona-Server/mysql-test/purify.supp	2013-06-26 08:18:34 +0000
@@ -12,8 +12,8 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 suppress UMR rw_read_held; mi_open; ha_myisam::open64; handler::ha_open; openfrm
 suppress UMR my_end; main

=== modified file 'Percona-Server/mysql-test/r/subselect.result'
--- Percona-Server/mysql-test/r/subselect.result	2012-07-18 09:48:15 +0000
+++ Percona-Server/mysql-test/r/subselect.result	2013-06-26 08:18:34 +0000
@@ -4769,9 +4769,9 @@
 SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')) ON 1' at line 1
 SELECT * FROM t1 JOIN  (t1 t1a UNION SELECT 1)  ON 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ON 1' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')  ON 1' at line 1
 SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ') ON 1' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')) ON 1' at line 1
 SELECT * FROM t1 JOIN  (t1 t1a)  t1a ON 1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1a ON 1' at line 1
 SELECT * FROM t1 JOIN ((t1 t1a)) t1a ON 1;

=== modified file 'Percona-Server/mysql-test/suite/funcs_1/r/is_columns_mysql.result'
--- Percona-Server/mysql-test/suite/funcs_1/r/is_columns_mysql.result	2011-03-18 14:16:17 +0000
+++ Percona-Server/mysql-test/suite/funcs_1/r/is_columns_mysql.result	2013-06-26 08:18:34 +0000
@@ -66,7 +66,7 @@
 def	mysql	help_category	help_category_id	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned	PRI		select,insert,update,references	
 def	mysql	help_category	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
 def	mysql	help_category	parent_category_id	3	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
-def	mysql	help_category	url	4	NULL	NO	char	128	384	NULL	NULL	utf8	utf8_general_ci	char(128)			select,insert,update,references	
+def	mysql	help_category	url	4	NULL	NO	text	65535	65535	NULL	NULL	utf8	utf8_general_ci	text			select,insert,update,references	
 def	mysql	help_keyword	help_keyword_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
 def	mysql	help_keyword	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
 def	mysql	help_relation	help_keyword_id	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
@@ -76,7 +76,7 @@
 def	mysql	help_topic	help_category_id	3	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
 def	mysql	help_topic	help_topic_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
 def	mysql	help_topic	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
-def	mysql	help_topic	url	6	NULL	NO	char	128	384	NULL	NULL	utf8	utf8_general_ci	char(128)			select,insert,update,references	
+def	mysql	help_topic	url	6	NULL	NO	text	65535	65535	NULL	NULL	utf8	utf8_general_ci	text			select,insert,update,references	
 def	mysql	host	Alter_priv	12	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 def	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 def	mysql	host	Create_priv	7	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
@@ -359,7 +359,7 @@
 NULL	mysql	help_category	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
 3.0000	mysql	help_category	name	char	64	192	utf8	utf8_general_ci	char(64)
 NULL	mysql	help_category	parent_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
-3.0000	mysql	help_category	url	char	128	384	utf8	utf8_general_ci	char(128)
+1.0000	mysql	help_category	url	text	65535	65535	utf8	utf8_general_ci	text
 NULL	mysql	help_keyword	help_keyword_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 3.0000	mysql	help_keyword	name	char	64	192	utf8	utf8_general_ci	char(64)
 NULL	mysql	help_relation	help_topic_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
@@ -369,7 +369,7 @@
 NULL	mysql	help_topic	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
 1.0000	mysql	help_topic	description	text	65535	65535	utf8	utf8_general_ci	text
 1.0000	mysql	help_topic	example	text	65535	65535	utf8	utf8_general_ci	text
-3.0000	mysql	help_topic	url	char	128	384	utf8	utf8_general_ci	char(128)
+1.0000	mysql	help_topic	url	text	65535	65535	utf8	utf8_general_ci	text
 3.0000	mysql	host	Host	char	60	180	utf8	utf8_bin	char(60)
 3.0000	mysql	host	Db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	host	Select_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')

=== modified file 'Percona-Server/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result'
--- Percona-Server/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result	2011-03-22 04:32:51 +0000
+++ Percona-Server/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result	2013-06-26 08:18:34 +0000
@@ -66,7 +66,7 @@
 def	mysql	help_category	help_category_id	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned	PRI			
 def	mysql	help_category	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI			
 def	mysql	help_category	parent_category_id	3	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned				
-def	mysql	help_category	url	4	NULL	NO	char	128	384	NULL	NULL	utf8	utf8_general_ci	char(128)				
+def	mysql	help_category	url	4	NULL	NO	text	65535	65535	NULL	NULL	utf8	utf8_general_ci	text				
 def	mysql	help_keyword	help_keyword_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI			
 def	mysql	help_keyword	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI			
 def	mysql	help_relation	help_keyword_id	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI			
@@ -76,7 +76,7 @@
 def	mysql	help_topic	help_category_id	3	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned				
 def	mysql	help_topic	help_topic_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI			
 def	mysql	help_topic	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI			
-def	mysql	help_topic	url	6	NULL	NO	char	128	384	NULL	NULL	utf8	utf8_general_ci	char(128)				
+def	mysql	help_topic	url	6	NULL	NO	text	65535	65535	NULL	NULL	utf8	utf8_general_ci	text				
 def	mysql	host	Alter_priv	12	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
 def	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
 def	mysql	host	Create_priv	7	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
@@ -359,7 +359,7 @@
 NULL	mysql	help_category	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
 3.0000	mysql	help_category	name	char	64	192	utf8	utf8_general_ci	char(64)
 NULL	mysql	help_category	parent_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
-3.0000	mysql	help_category	url	char	128	384	utf8	utf8_general_ci	char(128)
+1.0000	mysql	help_category	url	text	65535	65535	utf8	utf8_general_ci	text
 NULL	mysql	help_keyword	help_keyword_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 3.0000	mysql	help_keyword	name	char	64	192	utf8	utf8_general_ci	char(64)
 NULL	mysql	help_relation	help_topic_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
@@ -369,7 +369,7 @@
 NULL	mysql	help_topic	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
 1.0000	mysql	help_topic	description	text	65535	65535	utf8	utf8_general_ci	text
 1.0000	mysql	help_topic	example	text	65535	65535	utf8	utf8_general_ci	text
-3.0000	mysql	help_topic	url	char	128	384	utf8	utf8_general_ci	char(128)
+1.0000	mysql	help_topic	url	text	65535	65535	utf8	utf8_general_ci	text
 3.0000	mysql	host	Host	char	60	180	utf8	utf8_bin	char(60)
 3.0000	mysql	host	Db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	host	Select_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')

=== modified file 'Percona-Server/mysql-test/suite/funcs_1/r/is_tables_mysql.result'
--- Percona-Server/mysql-test/suite/funcs_1/r/is_tables_mysql.result	2010-12-17 11:11:34 +0000
+++ Percona-Server/mysql-test/suite/funcs_1/r/is_tables_mysql.result	2013-06-26 08:18:34 +0000
@@ -133,7 +133,7 @@
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
 VERSION	10
-ROW_FORMAT	Fixed
+ROW_FORMAT	Dynamic
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#

=== modified file 'Percona-Server/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result'
--- Percona-Server/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result	2011-03-18 11:14:42 +0000
+++ Percona-Server/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result	2013-06-26 08:18:34 +0000
@@ -133,7 +133,7 @@
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
 VERSION	10
-ROW_FORMAT	Fixed
+ROW_FORMAT	Dynamic
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -701,7 +701,7 @@
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
 VERSION	10
-ROW_FORMAT	Fixed
+ROW_FORMAT	Dynamic
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#

=== modified file 'Percona-Server/mysql-test/suite/innodb/r/percona_bug_999147.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_bug_999147.result	2012-06-01 12:15:25 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_bug_999147.result	2013-06-26 08:18:34 +0000
@@ -1,6 +1,7 @@
 DROP TABLE IF EXISTS t1;
 SET SESSION expand_fast_index_creation=ON;
 CREATE TEMPORARY TABLE t1 (a INT, b INT, INDEX(a));
+call mtr.add_suppression("does not exist in the InnoDB internal");
 SET debug="+d,crash_innodb_add_index_after";
 ALTER TABLE t1 ADD INDEX (b);
 ERROR HY000: Lost connection to MySQL server during query

=== modified file 'Percona-Server/mysql-test/suite/innodb/t/percona_bug_999147.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_bug_999147.test	2012-06-01 12:15:25 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_bug_999147.test	2013-06-26 08:18:34 +0000
@@ -18,6 +18,8 @@
 
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 
+call mtr.add_suppression("does not exist in the InnoDB internal");
+
 SET debug="+d,crash_innodb_add_index_after";
 --error 2013
 ALTER TABLE t1 ADD INDEX (b);

=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_loaddata_m.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_loaddata_m.result	2010-12-19 17:15:12 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_loaddata_m.result	2013-06-26 08:18:34 +0000
@@ -33,5 +33,5 @@
 COUNT(*)
 2
 DROP DATABASE mysqltest;
-DROP TABLE test.t1;
+DROP TABLE IF EXISTS test.t1;
 include/rpl_end.inc

=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_mdev382.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_mdev382.result	2013-02-18 04:48:10 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_mdev382.result	2013-06-26 08:18:34 +0000
@@ -298,7 +298,7 @@
 CREATE TABLE `t``2` ( `b``` INT PRIMARY KEY, `c``` INT NOT NULL,
 FOREIGN KEY fk (`c```) REFERENCES `t``1`(`a```)) ENGINE=innodb;
 TRUNCATE `t``1`;
-ERROR 42000: Cannot truncate a table referenced in a foreign key constraint (`db1``; SELECT 'oops!'`.`t``2`, CONSTRAINT `INNODB_FOREIGN_KEY_NAME` FOREIGN KEY (`c```) REFERENCES `db1``; SELECT 'oops!'`.`t``1` (`a```))
+ERROR 42000: Cannot truncate a table referenced in a foreign key constraint (`db1``; SELECT 'oops!'`.`t``2`, CONSTRAINT `t``INNODB_FOREIGN_KEY_NAME` FOREIGN KEY (`c```) REFERENCES `db1``; SELECT 'oops!'`.`t``1` (`a```))
 DROP TABLE `t``2`;
 DROP TABLE `t``1`;
 *** Test correct quoting of DELETE FROM statement binlogged for HEAP table that is emptied due to server restart

=== modified file 'Percona-Server/mysql-test/suite/rpl/t/rpl_loaddata_m.test'
--- Percona-Server/mysql-test/suite/rpl/t/rpl_loaddata_m.test	2010-12-19 17:15:12 +0000
+++ Percona-Server/mysql-test/suite/rpl/t/rpl_loaddata_m.test	2013-06-26 08:18:34 +0000
@@ -44,7 +44,7 @@
 # Cleanup
 connection master;
 DROP DATABASE mysqltest;
-DROP TABLE test.t1;
+DROP TABLE IF EXISTS test.t1;
 sync_slave_with_master;
 
 # End of test

=== modified file 'Percona-Server/mysql-test/suite/rpl/t/rpl_mdev382.test'
--- Percona-Server/mysql-test/suite/rpl/t/rpl_mdev382.test	2012-10-10 20:32:32 +0000
+++ Percona-Server/mysql-test/suite/rpl/t/rpl_mdev382.test	2013-06-26 08:18:34 +0000
@@ -182,7 +182,7 @@
 CREATE TABLE `t``1` ( `a``` INT PRIMARY KEY) ENGINE=innodb;
 CREATE TABLE `t``2` ( `b``` INT PRIMARY KEY, `c``` INT NOT NULL,
     FOREIGN KEY fk (`c```) REFERENCES `t``1`(`a```)) ENGINE=innodb;
---replace_regex /t@[0-9]+_ibfk_[0-9]+/INNODB_FOREIGN_KEY_NAME/
+--replace_regex /[0-9]+_ibfk_[0-9]+/INNODB_FOREIGN_KEY_NAME/
 --error ER_TRUNCATE_ILLEGAL_FK
 TRUNCATE `t``1`;
 DROP TABLE `t``2`;

=== modified file 'Percona-Server/mysql-test/t/mysql_upgrade.test'
--- Percona-Server/mysql-test/t/mysql_upgrade.test	2011-11-15 12:18:42 +0000
+++ Percona-Server/mysql-test/t/mysql_upgrade.test	2013-06-26 08:18:34 +0000
@@ -48,7 +48,9 @@
 --replace_result $MYSQLTEST_VARDIR var
 --replace_regex /.*mysqlcheck.*: Got/mysqlcheck: Got/ /\([0-9]*\)/(errno)/
 --error 1
---exec $MYSQL_UPGRADE --skip-verbose --force --host=not_existing_host 2>&1
+# NC: Added --skip-version-check, as the version check would fail when
+# mysql_upgrade tries to get the server version.
+--exec $MYSQL_UPGRADE --skip-verbose --force --host=not_existing_host --skip-version-check 2>&1
 
 #
 # Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE

=== modified file 'Percona-Server/mysys/default.c'
--- Percona-Server/mysys/default.c	2011-06-30 15:46:53 +0000
+++ Percona-Server/mysys/default.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /****************************************************************************
  Add all options from files named "group".cnf from the default_directories

=== modified file 'Percona-Server/mysys/md5.c'
--- Percona-Server/mysys/md5.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/md5.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /*
  * This code implements the MD5 message-digest algorithm.
@@ -176,7 +176,7 @@
   putu32(ctx->buf[1], digest + 4);
   putu32(ctx->buf[2], digest + 8);
   putu32(ctx->buf[3], digest + 12);
-  memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
+  memset(ctx, 0, sizeof(*ctx));	/* In case it's sensitive */
 }
 
 #ifndef ASM_MD5

=== modified file 'Percona-Server/mysys/mf_arr_appstr.c'
--- Percona-Server/mysys/mf_arr_appstr.c	2007-11-07 22:23:50 +0000
+++ Percona-Server/mysys/mf_arr_appstr.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include "mysys_priv.h"
 #include <m_string.h>                           /* strcmp() */

=== modified file 'Percona-Server/mysys/mf_iocache2.c'
--- Percona-Server/mysys/mf_iocache2.c	2013-05-15 05:05:18 +0000
+++ Percona-Server/mysys/mf_iocache2.c	2013-06-26 08:18:34 +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
@@ -63,6 +63,8 @@
       DBUG_RETURN(1);
     cache->read_pos= cache->read_end;
   } while ((bytes_in_cache= my_b_fill(cache)));
+  if(cache->error == -1)
+    DBUG_RETURN(1);
   DBUG_RETURN(0);
 }
 
@@ -219,6 +221,8 @@
     info->error= 0;
     return 0;					/* EOF */
   }
+  DBUG_EXECUTE_IF ("simulate_my_b_fill_error",
+                   {DBUG_SET("+d,simulate_file_read_error");});
   if ((length= my_read(info->file,info->buffer,max_length,
                        info->myflags)) == (size_t) -1)
   {

=== modified file 'Percona-Server/mysys/mf_qsort.c'
--- Percona-Server/mysys/mf_qsort.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/mf_qsort.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /*
   qsort implementation optimized for comparison of pointers

=== modified file 'Percona-Server/mysys/mf_qsort2.c'
--- Percona-Server/mysys/mf_qsort2.c	2006-12-23 19:17:15 +0000
+++ Percona-Server/mysys/mf_qsort2.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /* qsort that sends one extra argument to the compare subrutine */
 

=== modified file 'Percona-Server/mysys/mf_radix.c'
--- Percona-Server/mysys/mf_radix.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/mf_radix.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /*
   Radixsort for pointers to fixed length strings.

=== modified file 'Percona-Server/mysys/mf_same.c'
--- Percona-Server/mysys/mf_same.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/mf_same.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /* Kopierar biblioteksstrukturen och extensionen fr}n ett filnamn */
 

=== modified file 'Percona-Server/mysys/mf_soundex.c'
--- Percona-Server/mysys/mf_soundex.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/mf_soundex.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /****************************************************************
 *	SOUNDEX ALGORITHM in C					*

=== modified file 'Percona-Server/mysys/mf_wcomp.c'
--- Percona-Server/mysys/mf_wcomp.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/mf_wcomp.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /* Funktions for comparing with wild-cards */
 

=== modified file 'Percona-Server/mysys/mulalloc.c'
--- Percona-Server/mysys/mulalloc.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/mulalloc.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include "mysys_priv.h"
 #include <stdarg.h>

=== modified file 'Percona-Server/mysys/my_access.c'
--- Percona-Server/mysys/my_access.c	2013-05-23 08:39:28 +0000
+++ Percona-Server/mysys/my_access.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include "mysys_priv.h"
 #include <m_string.h>

=== modified file 'Percona-Server/mysys/my_aes.c'
--- Percona-Server/mysys/my_aes.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/my_aes.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 
 /*

=== modified file 'Percona-Server/mysys/my_alarm.c'
--- Percona-Server/mysys/my_alarm.c	2006-12-23 19:17:15 +0000
+++ Percona-Server/mysys/my_alarm.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /* Function to set a varible when we got a alarm */
 /* Used by my_lock samt functions in m_alarm.h */

=== modified file 'Percona-Server/mysys/my_bitmap.c'
--- Percona-Server/mysys/my_bitmap.c	2012-09-26 13:20:49 +0000
+++ Percona-Server/mysys/my_bitmap.c	2013-06-26 08:18:34 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /*
   Handling of uchar arrays as large bitmaps.

=== modified file 'Percona-Server/mysys/my_compare.c'
--- Percona-Server/mysys/my_compare.c	2011-03-29 12:43:49 +0000
+++ Percona-Server/mysys/my_compare.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
    
 #include <my_global.h>
 #include <m_ctype.h>

=== modified file 'Percona-Server/mysys/my_conio.c'
--- Percona-Server/mysys/my_conio.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/my_conio.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 
 #include "mysys_priv.h"

=== modified file 'Percona-Server/mysys/my_crc32.c'
--- Percona-Server/mysys/my_crc32.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/my_crc32.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include "mysys_priv.h"
 

=== modified file 'Percona-Server/mysys/my_div.c'
--- Percona-Server/mysys/my_div.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/my_div.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include "mysys_priv.h"
 

=== modified file 'Percona-Server/mysys/my_fopen.c'
--- Percona-Server/mysys/my_fopen.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/my_fopen.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include "mysys_priv.h"
 #include "my_static.h"

=== modified file 'Percona-Server/mysys/my_getopt.c'
--- Percona-Server/mysys/my_getopt.c	2012-10-17 03:47:45 +0000
+++ Percona-Server/mysys/my_getopt.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include <my_global.h>
 #include <m_string.h>

=== modified file 'Percona-Server/mysys/my_getpagesize.c'
--- Percona-Server/mysys/my_getpagesize.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/my_getpagesize.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include "mysys_priv.h"
 

=== modified file 'Percona-Server/mysys/my_getsystime.c'
--- Percona-Server/mysys/my_getsystime.c	2011-02-08 15:47:33 +0000
+++ Percona-Server/mysys/my_getsystime.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /* get time since epoc in 100 nanosec units */
 /* thus to get the current time we should use the system function

=== modified file 'Percona-Server/mysys/my_libwrap.c'
--- Percona-Server/mysys/my_libwrap.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/my_libwrap.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /* 
   This is needed to be able to compile with original libwrap header

=== modified file 'Percona-Server/mysys/my_memmem.c'
--- Percona-Server/mysys/my_memmem.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/my_memmem.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include <my_global.h>
 #include <m_string.h>

=== modified file 'Percona-Server/mysys/my_mkdir.c'
--- Percona-Server/mysys/my_mkdir.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/my_mkdir.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include "mysys_priv.h"
 #include "mysys_err.h"

=== modified file 'Percona-Server/mysys/my_read.c'
--- Percona-Server/mysys/my_read.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/my_read.c	2013-06-26 08:18:34 +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
@@ -49,6 +49,13 @@
 #else
     readbytes= read(Filedes, Buffer, Count);
 #endif
+    DBUG_EXECUTE_IF ("simulate_file_read_error",
+                     {
+                       errno= ENOSPC;
+                       readbytes= (size_t) -1;
+                       DBUG_SET("-d,simulate_file_read_error");
+                       DBUG_SET("-d,simulate_my_b_fill_error");
+                     });
 
     if (readbytes != Count)
     {

=== modified file 'Percona-Server/mysys/my_symlink2.c'
--- Percona-Server/mysys/my_symlink2.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/my_symlink2.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /*
   Advanced symlink handling.

=== modified file 'Percona-Server/mysys/test_dir.c'
--- Percona-Server/mysys/test_dir.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/test_dir.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /* TODO: Test all functions  */
 

=== modified file 'Percona-Server/mysys/test_xml.c'
--- Percona-Server/mysys/test_xml.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/mysys/test_xml.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include <stdio.h>
 #include <string.h>

=== modified file 'Percona-Server/mysys/typelib.c'
--- Percona-Server/mysys/typelib.c	2011-06-30 15:46:53 +0000
+++ Percona-Server/mysys/typelib.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /* Functions to handle typelib */
 

=== modified file 'Percona-Server/packaging/rpm-uln/mysql.spec.sh'
--- Percona-Server/packaging/rpm-uln/mysql.spec.sh	2013-04-12 10:11:38 +0000
+++ Percona-Server/packaging/rpm-uln/mysql.spec.sh	2013-06-26 08:18:34 +0000
@@ -662,6 +662,7 @@
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-*.spec
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-log-rotate
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/ChangeLog
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/solaris/postinstall-solaris
 rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-stress-test.pl.1*
 rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-test-run.pl.1*
 

=== added directory 'Percona-Server/packaging/solaris'
=== added file 'Percona-Server/packaging/solaris/CMakeLists.txt'
--- Percona-Server/packaging/solaris/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ Percona-Server/packaging/solaris/CMakeLists.txt	2013-06-26 08:18:34 +0000
@@ -0,0 +1,32 @@
+# Copyright (c) 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
+
+
+# Any files in this directory are auxiliary files for Solaris "pkg" packages.
+# They will be configured during "pkg" creation, not during (binary) build.
+
+# Currently, this expands to "support-files/" in most layouts,
+# but to "/usr/share/mysql/" in a RPM.
+# It is important not to pollute "/usr/bin".
+SET(inst_location ${INSTALL_SUPPORTFILESDIR})
+
+FOREACH(script  postinstall-solaris)
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
+                 ${CMAKE_CURRENT_BINARY_DIR}/${script} COPYONLY )
+
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${script} 
+     DESTINATION ${inst_location}/solaris COMPONENT Server_Scripts
+     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ENDFOREACH()

=== added file 'Percona-Server/packaging/solaris/postinstall-solaris.sh'
--- Percona-Server/packaging/solaris/postinstall-solaris.sh	1970-01-01 00:00:00 +0000
+++ Percona-Server/packaging/solaris/postinstall-solaris.sh	2013-06-26 08:18:34 +0000
@@ -0,0 +1,127 @@
+#!/bin/sh
+#
+# 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
+# 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
+#
+# Solaris post install script
+#
+
+#if [ /usr/man/bin/makewhatis ] ; then
+#  /usr/man/bin/makewhatis "$BASEDIR/mysql/man"
+#fi
+
+mygroup=mysql
+myuser=mysql
+mydatadir=/var/lib/mysql
+basedir=@@basedir@@
+
+if [ -n "$BASEDIR" ] ; then
+  basedir="$BASEDIR"
+fi
+
+# What MySQL calls "basedir" and what pkgadd tools calls "basedir"
+# is not the same thing. The default pkgadd base directory is /opt/mysql,
+# the MySQL one "/opt/mysql/mysql".
+
+mybasedir="$basedir/@@instdir@@"
+mystart1="$mybasedir/support-files/mysql.server"
+myinstdb="$mybasedir/scripts/mysql_install_db"
+mystart=/etc/init.d/mysql
+
+# Check: Is this a first installation, or an upgrade ?
+
+if [ -d "$mydatadir/mysql" ] ; then
+  :   # If the directory for system table files exists, we assume an upgrade.
+else
+  INSTALL=new  # This is a new installation, the directory will soon be created.
+fi
+
+# Create data directory if needed
+
+[ -d "$mydatadir"       ] || mkdir -p -m 755 "$mydatadir" || exit 1
+[ -d "$mydatadir/mysql" ] || mkdir "$mydatadir/mysql"     || exit 1
+[ -d "$mydatadir/test"  ] || mkdir "$mydatadir/test"      || exit 1
+
+# Set the data directory to the right user/group
+
+chown -R $myuser:$mygroup $mydatadir
+
+# Solaris patch 119255 (somewhere around revision 42) changes the behaviour
+# of pkgadd to set TMPDIR internally to a root-owned install directory.  This
+# has the unfortunate side effect of breaking running mysql_install_db with
+# the --user=mysql argument as mysqld uses TMPDIR if set, and is unable to
+# write temporary tables to that directory.  To work around this issue, we
+# create a subdirectory inside TMPDIR (if set) for mysqld to write to.
+#
+# Idea from Ben Hekster <[e-mail]> in bug#31164
+
+if [ -n "$TMPDIR" ] ; then
+  savetmpdir="$TMPDIR"
+  TMPDIR="$TMPDIR/mysql.$$"
+  export TMPDIR
+  mkdir "$TMPDIR"
+  chown $myuser:$mygroup "$TMPDIR"
+fi
+
+
+# BUG# 16812255: Removing the option --random-passwords
+# as this is supported only for MYSQL releases 5.6 and above.
+ 
+if [ -n "$INSTALL" ] ; then
+  # We install/update the system tables
+  (
+    cd "$mybasedir"
+    scripts/mysql_install_db \
+	  --rpm \
+	  --user=mysql \
+	  --basedir="$mybasedir" \
+	  --datadir=$mydatadir
+  )
+fi
+
+if [ -n "$savetmpdir" ] ; then
+  TMPDIR="$savetmpdir"
+fi
+
+# ----------------------------------------------------------------------
+
+# Handle situation there is old start script installed already
+
+# If old start script is a soft link, we just remove it
+[ -h "$mystart" ] && rm -f "$mystart"
+
+# If old start script is a file, we rename it
+[ -f "$mystart" ] && mv -f "$mystart" "$mystart.old.$$"
+
+# ----------------------------------------------------------------------
+
+# We create a copy of an unmodified start script,
+# as a reference for the one maybe modifying it
+
+cp -f "$mystart1.in" "$mystart.in" || exit 1
+
+# We rewrite some scripts
+
+for script in "$mystart" "$mystart1" "$myinstdb" ; do
+  script_in="$script.in"
+  sed -e "s,@basedir@,$mybasedir,g" \
+      -e "s,@datadir@,$mydatadir,g" "$script_in" > "$script"
+  chmod u+x $script
+done
+
+rm -f "$mystart.in"
+
+exit 0
+

=== modified file 'Percona-Server/scripts/comp_sql.c'
--- Percona-Server/scripts/comp_sql.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/scripts/comp_sql.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /*
   Written by Magnus Svensson

=== modified file 'Percona-Server/scripts/fill_help_tables.sql'
--- Percona-Server/scripts/fill_help_tables.sql	2013-03-12 08:39:11 +0000
+++ Percona-Server/scripts/fill_help_tables.sql	2013-06-26 08:18:34 +0000
@@ -11,7 +11,8 @@
 --
 -- 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
 
 -- DO NOT EDIT THIS FILE. It is generated automatically.
 

=== modified file 'Percona-Server/scripts/mysql_system_tables.sql'
--- Percona-Server/scripts/mysql_system_tables.sql	2011-06-30 15:46:53 +0000
+++ Percona-Server/scripts/mysql_system_tables.sql	2013-06-26 08:18:34 +0000
@@ -48,10 +48,10 @@
 CREATE TABLE IF NOT EXISTS columns_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin   comment='Column privileges';
 
 
-CREATE TABLE IF NOT EXISTS help_topic ( help_topic_id int unsigned not null, name char(64) not null, help_category_id smallint unsigned not null, description text not null, example  text not null, url char(128) not null, primary key (help_topic_id), unique index (name) ) engine=MyISAM CHARACTER SET utf8   comment='help topics';
-
-
-CREATE TABLE IF NOT EXISTS help_category ( help_category_id smallint unsigned not null, name  char(64) not null, parent_category_id smallint unsigned null, url char(128) not null, primary key (help_category_id), unique index (name) ) engine=MyISAM CHARACTER SET utf8   comment='help categories';
+CREATE TABLE IF NOT EXISTS help_topic ( help_topic_id int unsigned not null, name char(64) not null, help_category_id smallint unsigned not null, description text not null, example text not null, url text not null, primary key (help_topic_id), unique index (name) ) engine=MyISAM CHARACTER SET utf8 comment='help topics';
+
+
+CREATE TABLE IF NOT EXISTS help_category ( help_category_id smallint unsigned not null, name  char(64) not null, parent_category_id smallint unsigned null, url text not null, primary key (help_category_id), unique index (name) ) engine=MyISAM CHARACTER SET utf8 comment='help categories';
 
 
 CREATE TABLE IF NOT EXISTS help_relation ( help_topic_id int unsigned not null references help_topic, help_keyword_id  int unsigned not null references help_keyword, primary key (help_keyword_id, help_topic_id) ) engine=MyISAM CHARACTER SET utf8 comment='keyword-topic relation';

=== modified file 'Percona-Server/scripts/mysql_test_data_timezone.sql'
--- Percona-Server/scripts/mysql_test_data_timezone.sql	2010-12-28 18:57:23 +0000
+++ Percona-Server/scripts/mysql_test_data_timezone.sql	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 -- 
 -- 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 INSERT INTO time_zone_name (Name, Time_Zone_id) VALUES   ('MET', 1), ('UTC', 2), ('Universal', 2),    ('Europe/Moscow',3), ('leap/Europe/Moscow',4),    ('Japan', 5);
 INSERT INTO time_zone (Time_zone_id, Use_leap_seconds)   VALUES (1,'N'), (2,'N'), (3,'N'), (4,'Y'), (5,'N');

=== modified file 'Percona-Server/sql-bench/CMakeLists.txt'
--- Percona-Server/sql-bench/CMakeLists.txt	2010-11-13 22:16:52 +0000
+++ Percona-Server/sql-bench/CMakeLists.txt	2013-06-26 08:18:34 +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
@@ -38,26 +38,34 @@
 
 FOREACH(file ${all_files})
   IF(NOT IS_DIRECTORY ${file} AND NOT ${file} MATCHES "Make|as3ap|/example$" )
-  GET_FILENAME_COMPONENT(ext ${file} EXT)
-  GET_FILENAME_COMPONENT(name ${file} NAME)
-  SET(target ${name})
-  IF(ext MATCHES ".sh$")
-    # Those are perl files actually
-    STRING(REPLACE ".sh" "" target ${target} )
-    IF(WIN32)
-      IF(NOT ext MATCHES ".pl")
-        SET(target "${target}.pl")
-      ENDIF()
-    ENDIF()
-  ENDIF()
-  SET(target "${CMAKE_CURRENT_BINARY_DIR}/${target}")
-  CONFIGURE_FILE(${file} ${target} COPYONLY)
-  IF (ext MATCHES ".bat")
-    IF(WIN32) 
-      INSTALL(FILES ${target} DESTINATION ${prefix}sql-bench COMPONENT SqlBench)
-    ENDIF()
-  ELSE()
-    INSTALL(FILES ${target} DESTINATION ${prefix}sql-bench COMPONENT SqlBench)
-  ENDIF()
+    GET_FILENAME_COMPONENT(ext ${file} EXT)
+    GET_FILENAME_COMPONENT(name ${file} NAME)
+    SET(target ${name})
+    IF(ext MATCHES ".sh$")
+      # Those are perl files actually
+      STRING(REPLACE ".sh" "" target ${target} )
+      IF(WIN32)
+        IF(NOT ext MATCHES ".pl")
+          SET(target "${target}.pl")
+        ENDIF()
+      ENDIF()
+    ENDIF()
+    SET(target "${CMAKE_CURRENT_BINARY_DIR}/${target}")
+    CONFIGURE_FILE(${file} ${target} COPYONLY)
+    IF (UNIX AND NOT ${name} MATCHES "README")
+      EXECUTE_PROCESS(COMMAND chmod +x ${target})
+    ENDIF()
+    IF (ext MATCHES ".bat")
+      IF(WIN32) 
+        INSTALL(PROGRAMS ${target}
+          DESTINATION ${prefix}sql-bench COMPONENT SqlBench)
+      ENDIF()
+    ELSEIF(name MATCHES "README")
+      INSTALL(FILES ${target}
+        DESTINATION ${prefix}sql-bench COMPONENT SqlBench)
+    ELSE()
+      INSTALL(PROGRAMS ${target}
+        DESTINATION ${prefix}sql-bench COMPONENT SqlBench)
+    ENDIF()
   ENDIF()
 ENDFOREACH()

=== modified file 'Percona-Server/sql-bench/example.bat' (properties changed: -x to +x)
=== modified file 'Percona-Server/sql-bench/pwd.bat' (properties changed: -x to +x)
=== modified file 'Percona-Server/sql-bench/uname.bat' (properties changed: -x to +x)
=== modified file 'Percona-Server/sql-common/client.c'
--- Percona-Server/sql-common/client.c	2013-03-27 19:27:33 +0000
+++ Percona-Server/sql-common/client.c	2013-06-26 08:18:34 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 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
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /*
   This file is included by both libmysql.c (the MySQL client C API)
@@ -1385,7 +1385,7 @@
           break;
         case OPT_plugin_dir:
           {
-            char buff[FN_REFLEN];
+            char buff[FN_REFLEN], buff2[FN_REFLEN];
             if (strlen(opt_arg) >= FN_REFLEN)
               opt_arg[FN_REFLEN]= '\0';
             if (my_realpath(buff, opt_arg, 0))
@@ -1394,8 +1394,8 @@
                                     opt_arg));
               break;
             }
-            convert_dirname(buff, buff, NULL);
-            EXTENSION_SET_STRING(options, plugin_dir, buff);
+            convert_dirname(buff2, buff, NULL);
+            EXTENSION_SET_STRING(options, plugin_dir, buff2);
           }
           break;
         case OPT_default_auth:
@@ -2215,6 +2215,8 @@
   }
 #endif
 
+  if (mysql->options.charset_name)
+    my_free(mysql->options.charset_name);
   if (!(mysql->options.charset_name= my_strdup(csname, MYF(MY_WME))))
     return 1;
   return 0;

=== modified file 'Percona-Server/sql-common/pack.c'
--- Percona-Server/sql-common/pack.c	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql-common/pack.c	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include <my_global.h>
 #include <mysql_com.h>

=== modified file 'Percona-Server/sql/custom_conf.h'
--- Percona-Server/sql/custom_conf.h	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/custom_conf.h	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #ifndef __MYSQL_CUSTOM_BUILD_CONFIG__
 #define __MYSQL_CUSTOM_BUILD_CONFIG__

=== modified file 'Percona-Server/sql/filesort.cc'
--- Percona-Server/sql/filesort.cc	2013-02-17 11:15:44 +0000
+++ Percona-Server/sql/filesort.cc	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 
 /**

=== modified file 'Percona-Server/sql/ha_ndbcluster_cond.cc'
--- Percona-Server/sql/ha_ndbcluster_cond.cc	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/ha_ndbcluster_cond.cc	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 /*

=== modified file 'Percona-Server/sql/ha_ndbcluster_cond.h'
--- Percona-Server/sql/ha_ndbcluster_cond.h	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/ha_ndbcluster_cond.h	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /*
   This file defines the data structures used by engine condition pushdown in

=== modified file 'Percona-Server/sql/ha_ndbcluster_tables.h'
--- Percona-Server/sql/ha_ndbcluster_tables.h	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/ha_ndbcluster_tables.h	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 #define NDB_REP_DB      "mysql"

=== modified file 'Percona-Server/sql/hostname.cc'
--- Percona-Server/sql/hostname.cc	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/hostname.cc	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 
 /**

=== modified file 'Percona-Server/sql/item.cc'
--- Percona-Server/sql/item.cc	2013-05-15 05:05:18 +0000
+++ Percona-Server/sql/item.cc	2013-06-26 08:18:34 +0000
@@ -3386,7 +3386,9 @@
     /* Here str_value is guaranteed to be in final_character_set_of_str_value */
 
     max_length= str_value.numchars() * str_value.charset()->mbmaxlen;
-    decimals= 0;
+
+    /* For the strings converted to numeric form within some functions */
+    decimals= NOT_FIXED_DEC;
     /*
       str_value_ptr is returned from val_str(). It must be not alloced
       to prevent it's modification by val_str() invoker.

=== modified file 'Percona-Server/sql/item.h'
--- Percona-Server/sql/item.h	2013-05-15 05:05:18 +0000
+++ Percona-Server/sql/item.h	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 
 #ifdef USE_PRAGMA_INTERFACE

=== modified file 'Percona-Server/sql/item_cmpfunc.cc'
--- Percona-Server/sql/item_cmpfunc.cc	2013-02-27 21:33:00 +0000
+++ Percona-Server/sql/item_cmpfunc.cc	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 
 /**

=== modified file 'Percona-Server/sql/item_cmpfunc.h'
--- Percona-Server/sql/item_cmpfunc.h	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/item_cmpfunc.h	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 
 /* compare and test functions */

=== modified file 'Percona-Server/sql/item_func.cc'
--- Percona-Server/sql/item_func.cc	2013-05-15 05:05:18 +0000
+++ Percona-Server/sql/item_func.cc	2013-06-26 08:18:34 +0000
@@ -5790,6 +5790,13 @@
 {
   DBUG_ENTER("Item_func_match::init_search");
 
+  /*
+    We will skip execution if the item is not fixed
+    with fix_field
+  */
+  if (!fixed)
+    DBUG_VOID_RETURN;
+
   /* Check if init_search() has been called before */
   if (ft_handler)
   {
@@ -5920,6 +5927,13 @@
   uint ft_to_key[MAX_KEY], ft_cnt[MAX_KEY], fts=0, keynr;
   uint max_cnt=0, mkeys=0, i;
 
+  /*
+    We will skip execution if the item is not fixed
+    with fix_field
+  */
+  if (!fixed)
+    return false;
+
   if (key == NO_SUCH_KEY)
     return 0;
   

=== modified file 'Percona-Server/sql/item_func.h'
--- Percona-Server/sql/item_func.h	2013-05-15 05:05:18 +0000
+++ Percona-Server/sql/item_func.h	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 
 /* Function items used by mysql */

=== modified file 'Percona-Server/sql/item_geofunc.h'
--- Percona-Server/sql/item_geofunc.h	2011-03-08 17:39:25 +0000
+++ Percona-Server/sql/item_geofunc.h	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 
 /* This file defines all spatial functions */

=== modified file 'Percona-Server/sql/item_strfunc.h'
--- Percona-Server/sql/item_strfunc.h	2011-07-03 23:48:19 +0000
+++ Percona-Server/sql/item_strfunc.h	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 
 /* This file defines all string functions */

=== modified file 'Percona-Server/sql/item_sum.cc'
--- Percona-Server/sql/item_sum.cc	2013-01-15 10:00:26 +0000
+++ Percona-Server/sql/item_sum.cc	2013-06-26 08:18:34 +0000
@@ -1,4 +1,5 @@
-/* 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
@@ -2839,9 +2840,9 @@
   for (uint i= 0; i < item_func->arg_count_field; i++)
   {
     Item *item= item_func->args[i];
-    /* 
-      If field_item is a const item then either get_tp_table_field returns 0
-      or it is an item over a const table. 
+    /*
+      If item is a const item then either get_tmp_table_field returns 0
+      or it is an item over a const table.
     */
     if (item->const_item())
       continue;
@@ -2851,9 +2852,13 @@
       the temporary table, not the original field
     */
     Field *field= item->get_tmp_table_field();
-    int res;
+
+    if (!field)
+      continue;
+
     uint offset= field->offset(field->table->record[0])-table->s->null_bytes;
-    if((res= field->cmp((uchar*)key1 + offset, (uchar*)key2 + offset)))
+    int res= field->cmp((uchar*)key1 + offset, (uchar*)key2 + offset);
+    if (res)
       return res;
   }
   return 0;
@@ -2878,23 +2883,25 @@
   {
     Item *item= *(*order_item)->item;
     /*
+      If item is a const item then either get_tmp_table_field returns 0
+      or it is an item over a const table.
+    */
+    if (item->const_item())
+      continue;
+    /*
       We have to use get_tmp_table_field() instead of
       real_item()->get_tmp_table_field() because we want the field in
       the temporary table, not the original field
-    */
+     */
     Field *field= item->get_tmp_table_field();
-    /* 
-      If item is a const item then either get_tp_table_field returns 0
-      or it is an item over a const table. 
-    */
-    if (field && !item->const_item())
-    {
-      int res;
-      uint offset= (field->offset(field->table->record[0]) -
-                    table->s->null_bytes);
-      if ((res= field->cmp((uchar*)key1 + offset, (uchar*)key2 + offset)))
-        return (*order_item)->asc ? res : -res;
-    }
+    if (!field)
+      continue;
+
+    uint offset= (field->offset(field->table->record[0]) -
+                  table->s->null_bytes);
+    int res= field->cmp((uchar*)key1 + offset, (uchar*)key2 + offset);
+    if (res)
+      return (*order_item)->asc ? res : -res;
   }
   /*
     We can't return 0 because in that case the tree class would remove this
@@ -2933,23 +2940,28 @@
   for (; arg < arg_end; arg++)
   {
     String *res;
-    if (! (*arg)->const_item())
+    /*
+      We have to use get_tmp_table_field() instead of
+      real_item()->get_tmp_table_field() because we want the field in
+      the temporary table, not the original field
+      We also can't use table->field array to access the fields
+      because it contains both order and arg list fields.
+     */
+    if ((*arg)->const_item())
+      res= (*arg)->val_str(&tmp);
+    else
     {
-      /*
-	We have to use get_tmp_table_field() instead of
-	real_item()->get_tmp_table_field() because we want the field in
-	the temporary table, not the original field
-        We also can't use table->field array to access the fields
-        because it contains both order and arg list fields.
-      */
       Field *field= (*arg)->get_tmp_table_field();
-      uint offset= (field->offset(field->table->record[0]) -
-                    table->s->null_bytes);
-      DBUG_ASSERT(offset < table->s->reclength);
-      res= field->val_str(&tmp, key + offset);
+      if (field)
+      {
+        uint offset= (field->offset(field->table->record[0]) -
+                      table->s->null_bytes);
+        DBUG_ASSERT(offset < table->s->reclength);
+        res= field->val_str(&tmp, key + offset);
+      }
+      else
+        res= (*arg)->val_str(&tmp);
     }
-    else
-      res= (*arg)->val_str(&tmp);
     if (res)
       result->append(*res);
   }
@@ -2997,11 +3009,12 @@
 Item_func_group_concat::
 Item_func_group_concat(Name_resolution_context *context_arg,
                        bool distinct_arg, List<Item> *select_list,
-                       SQL_I_List<ORDER> *order_list, String *separator_arg)
+                       const SQL_I_List<ORDER> &order_list,
+                       String *separator_arg)
   :tmp_table_param(0), separator(separator_arg), tree(0),
    unique_filter(NULL), table(0),
    order(0), context(context_arg),
-   arg_count_order(order_list ? order_list->elements : 0),
+   arg_count_order(order_list.elements),
    arg_count_field(select_list->elements),
    row_count(0),
    distinct(distinct_arg),
@@ -3041,7 +3054,7 @@
   if (arg_count_order)
   {
     ORDER **order_ptr= order;
-    for (ORDER *order_item= order_list->first;
+    for (ORDER *order_item= order_list.first;
          order_item != NULL;
          order_item= order_item->next)
     {
@@ -3089,7 +3102,14 @@
   tmp= (ORDER *)(order + arg_count_order);
   for (uint i= 0; i < arg_count_order; i++, tmp++)
   {
-    memcpy(tmp, item->order[i], sizeof(ORDER));
+    /*
+      Compiler generated copy constructor is used to
+      to copy all the members of ORDER struct.
+      It's also necessary to update ORDER::next pointer
+      so that it points to new ORDER element.
+    */
+    new (tmp) st_order(*(item->order[i])); 
+    tmp->next= (i + 1 == arg_count_order) ? NULL : (tmp + 1);
     order[i]= tmp;
   }
 }
@@ -3188,12 +3208,12 @@
   for (uint i= 0; i < arg_count_field; i++)
   {
     Item *show_item= args[i];
-    if (!show_item->const_item())
-    {
-      Field *f= show_item->get_tmp_table_field();
-      if (f->is_null_in_record((const uchar*) table->record[0]))
+    if (show_item->const_item())
+      continue;
+
+    Field *field= show_item->get_tmp_table_field();
+    if (field && field->is_null_in_record((const uchar*) table->record[0]))
         return 0;                               // Skip row if it contains null
-    }
   }
 
   null_value= FALSE;

=== modified file 'Percona-Server/sql/item_sum.h'
--- Percona-Server/sql/item_sum.h	2011-10-12 13:41:25 +0000
+++ Percona-Server/sql/item_sum.h	2013-06-26 08:18:34 +0000
@@ -1,7 +1,8 @@
 #ifndef ITEM_SUM_INCLUDED
 #define ITEM_SUM_INCLUDED
 
-/* 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
@@ -1402,7 +1403,7 @@
 public:
   Item_func_group_concat(Name_resolution_context *context_arg,
                          bool is_distinct, List<Item> *is_select,
-                         SQL_I_List<ORDER> *is_order, String *is_separator);
+                         const SQL_I_List<ORDER> &is_order, String *is_separator);
 
   Item_func_group_concat(THD *thd, Item_func_group_concat *item);
   ~Item_func_group_concat();

=== modified file 'Percona-Server/sql/item_timefunc.h'
--- Percona-Server/sql/item_timefunc.h	2011-07-03 23:48:19 +0000
+++ Percona-Server/sql/item_timefunc.h	2013-06-26 08:18:34 +0000
@@ -14,7 +14,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 
 /* Function items used by mysql */

=== modified file 'Percona-Server/sql/lex_symbol.h'
--- Percona-Server/sql/lex_symbol.h	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/lex_symbol.h	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 
 /* This struct includes all reserved words and functions */

=== modified file 'Percona-Server/sql/log.cc'
--- Percona-Server/sql/log.cc	2013-06-01 15:04:43 +0000
+++ Percona-Server/sql/log.cc	2013-06-26 08:18:34 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 
 /**

=== modified file 'Percona-Server/sql/log_event.cc'
--- Percona-Server/sql/log_event.cc	2013-06-01 15:04:43 +0000
+++ Percona-Server/sql/log_event.cc	2013-06-26 08:18:34 +0000
@@ -5888,7 +5888,7 @@
                    const Format_description_log_event* description_event)
   :Log_event(buf, description_event)
 #ifndef MYSQL_CLIENT
-  , deferred(false)
+  , deferred(false), query_id(0)
 #endif
 {
   bool error= false;
@@ -6170,11 +6170,16 @@
 {
   Item *it= 0;
   CHARSET_INFO *charset;
+  query_id_t sav_query_id= 0; /* memorize orig id when deferred applying */
 
   if (rli->deferred_events_collecting)
   {
-    set_deferred();
+    set_deferred(current_thd->query_id);
     return rli->deferred_events->add(this);
+  } else if (is_deferred())
+  {
+    sav_query_id= current_thd->query_id;
+    current_thd->query_id= query_id; /* recreating original time context */
   }
 
   if (!(charset= get_charset(charset_number, MYF(MY_WME))))
@@ -6250,6 +6255,8 @@
                  (flags & User_var_log_event::UNSIGNED_F));
   if (!is_deferred())
     free_root(thd->mem_root, 0);
+  else
+    current_thd->query_id= sav_query_id; /* restore current query's context */
 
   return 0;
 }
@@ -9437,6 +9444,8 @@
 #ifdef MYSQL_CLIENT
 void Write_rows_log_event::print(FILE *file, PRINT_EVENT_INFO* print_event_info)
 {
+  DBUG_EXECUTE_IF("simulate_cache_read_error",
+                  {DBUG_SET("+d,simulate_my_b_fill_error");});
   Rows_log_event::print_helper(file, print_event_info, "Write_rows");
 }
 #endif

=== modified file 'Percona-Server/sql/log_event.h'
--- Percona-Server/sql/log_event.h	2013-06-01 15:04:43 +0000
+++ Percona-Server/sql/log_event.h	2013-06-26 08:18:34 +0000
@@ -2612,6 +2612,7 @@
   uchar flags;
 #ifdef MYSQL_SERVER
   bool deferred;
+  query_id_t query_id;
   User_var_log_event(THD* thd_arg, char *name_arg, uint name_len_arg,
                      char *val_arg, ulong val_len_arg, Item_result type_arg,
 		     uint charset_number_arg, uchar flags_arg)
@@ -2636,7 +2637,11 @@
      and which case the applier adjusts execution path.
   */
   bool is_deferred() { return deferred; }
-  void set_deferred() { deferred= true; }
+  /*
+    In case of the deffered applying the variable instance is flagged
+    and the parsing time query id is stored to be used at applying time.
+  */
+  void set_deferred(query_id_t qid) { deferred= true; query_id= qid; }
 #endif
   bool is_valid() const { return name != 0; }
 

=== modified file 'Percona-Server/sql/log_event_old.h'
--- Percona-Server/sql/log_event_old.h	2013-05-15 05:05:18 +0000
+++ Percona-Server/sql/log_event_old.h	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #ifndef LOG_EVENT_OLD_H
 #define LOG_EVENT_OLD_H

=== modified file 'Percona-Server/sql/mem_root_array.h'
--- Percona-Server/sql/mem_root_array.h	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/mem_root_array.h	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 
 #ifndef MEM_ROOT_ARRAY_INCLUDED

=== modified file 'Percona-Server/sql/my_decimal.h'
--- Percona-Server/sql/my_decimal.h	2012-02-16 09:48:16 +0000
+++ Percona-Server/sql/my_decimal.h	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /**
   @file

=== modified file 'Percona-Server/sql/mysqld.cc'
--- Percona-Server/sql/mysqld.cc	2013-05-23 08:39:28 +0000
+++ Percona-Server/sql/mysqld.cc	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 #include "my_global.h"                          /* NO_EMBEDDED_ACCESS_CHECKS */
 #include "sql_priv.h"

=== modified file 'Percona-Server/sql/net_serv.cc'
--- Percona-Server/sql/net_serv.cc	2013-01-30 09:55:26 +0000
+++ Percona-Server/sql/net_serv.cc	2013-06-26 08:18:34 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /**
   @file

=== modified file 'Percona-Server/sql/opt_range.cc'
--- Percona-Server/sql/opt_range.cc	2013-05-15 05:05:18 +0000
+++ Percona-Server/sql/opt_range.cc	2013-06-26 08:18:34 +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
@@ -671,6 +671,15 @@
 
   /* Number of SEL_ARG objects allocated by SEL_ARG::clone_tree operations */
   uint alloced_sel_args; 
+
+  bool statement_should_be_aborted() const
+  {
+    return
+      thd->is_fatal_error ||
+      thd->is_error() ||
+      alloced_sel_args > SEL_ARG::MAX_SEL_ARGS;
+  }
+
 };
 
 class PARAM : public RANGE_OPT_PARAM
@@ -5336,6 +5345,34 @@
               {
                 new_interval->min_value= last_val->max_value;
                 new_interval->min_flag= NEAR_MIN;
+
+                /*
+                  If the interval is over a partial keypart, the
+                  interval must be "c_{i-1} <= X < c_i" instead of
+                  "c_{i-1} < X < c_i". Reason:
+
+                  Consider a table with a column "my_col VARCHAR(3)",
+                  and an index with definition
+                  "INDEX my_idx my_col(1)". If the table contains rows
+                  with my_col values "f" and "foo", the index will not
+                  distinguish the two rows.
+
+                  Note that tree_or() below will effectively merge
+                  this range with the range created for c_{i-1} and
+                  we'll eventually end up with only one range:
+                  "NULL < X".
+
+                  Partitioning indexes are never partial.
+                */
+                if (param->using_real_indexes)
+                {
+                  const KEY key=
+                    param->table->key_info[param->real_keynr[idx]];
+                  const KEY_PART_INFO *kpi= key.key_part + new_interval->part;
+
+                  if (kpi->key_part_flag & HA_PART_KEY_SEG)
+                    new_interval->min_flag= 0;
+                }
               }
             }
             /* 
@@ -5541,34 +5578,35 @@
 
     if (((Item_cond*) cond)->functype() == Item_func::COND_AND_FUNC)
     {
-      tree=0;
+      tree= NULL;
       Item *item;
       while ((item=li++))
       {
-	SEL_TREE *new_tree=get_mm_tree(param,item);
-	if (param->thd->is_fatal_error || 
-            param->alloced_sel_args > SEL_ARG::MAX_SEL_ARGS)
-	  DBUG_RETURN(0);	// out of memory
-	tree=tree_and(param,tree,new_tree);
-	if (tree && tree->type == SEL_TREE::IMPOSSIBLE)
-	  break;
+        SEL_TREE *new_tree= get_mm_tree(param,item);
+        if (param->statement_should_be_aborted())
+          DBUG_RETURN(NULL);
+        tree= tree_and(param,tree,new_tree);
+        if (tree && tree->type == SEL_TREE::IMPOSSIBLE)
+          break;
       }
     }
     else
-    {						// COND OR
-      tree=get_mm_tree(param,li++);
+    {                                           // COND OR
+      tree= get_mm_tree(param,li++);
+      if (param->statement_should_be_aborted())
+        DBUG_RETURN(NULL);
       if (tree)
       {
-	Item *item;
-	while ((item=li++))
-	{
-	  SEL_TREE *new_tree=get_mm_tree(param,item);
-	  if (!new_tree)
-	    DBUG_RETURN(0);	// out of memory
-	  tree=tree_or(param,tree,new_tree);
-	  if (!tree || tree->type == SEL_TREE::ALWAYS)
-	    break;
-	}
+        Item *item;
+        while ((item=li++))
+        {
+          SEL_TREE *new_tree=get_mm_tree(param,item);
+          if (new_tree == NULL || param->statement_should_be_aborted())
+            DBUG_RETURN(NULL);
+          tree= tree_or(param,tree,new_tree);
+          if (tree == NULL || tree->type == SEL_TREE::ALWAYS)
+            break;
+        }
       }
     }
     DBUG_RETURN(tree);
@@ -5817,6 +5855,7 @@
 
   if (key_part->image_type == Field::itMBR)
   {
+    // @todo: use is_spatial_operator() instead?
     switch (type) {
     case Item_func::SP_EQUALS_FUNC:
     case Item_func::SP_DISJOINT_FUNC:
@@ -11070,9 +11109,11 @@
     */
     if (min_max_arg_part && min_max_arg_part->field->is_null())
     {
+      uchar key_buf[MAX_KEY_LENGTH];
+
       /* Find the first subsequent record without NULL in the MIN/MAX field. */
-      key_copy(tmp_record, record, index_info, 0);
-      result= file->index_read_map(record, tmp_record,
+      key_copy(key_buf, record, index_info, 0);
+      result= file->index_read_map(record, key_buf,
                                    make_keypart_map(real_key_parts),
                                    HA_READ_AFTER_KEY);
       /*
@@ -11088,7 +11129,7 @@
       if (!result)
       {
         if (key_cmp(index_info->key_part, group_prefix, real_prefix_len))
-          key_restore(record, tmp_record, index_info, 0);
+          key_restore(record, key_buf, index_info, 0);
       }
       else if (result == HA_ERR_KEY_NOT_FOUND || result == HA_ERR_END_OF_FILE)
         result= 0; /* There is a result in any case. */

=== modified file 'Percona-Server/sql/rpl_filter.cc'
--- Percona-Server/sql/rpl_filter.cc	2012-05-10 07:49:14 +0000
+++ Percona-Server/sql/rpl_filter.cc	2013-06-26 08:18:34 +0000
@@ -154,11 +154,14 @@
     DBUG_RETURN(1); // Ok to replicate if the user puts no constraints
 
   /*
-    If the user has specified restrictions on which databases to replicate
-    and db was not selected, do not replicate.
+    Previous behaviour "if the user has specified restrictions on which
+    databases to replicate and db was not selected, do not replicate" has
+    been replaced with "do replicate".
+    Since the filtering criteria is not equal to "NULL" the statement should
+    be logged into binlog.
   */
   if (!db)
-    DBUG_RETURN(0);
+    DBUG_RETURN(1);
 
   if (!do_db.is_empty()) // if the do's are not empty
   {

=== modified file 'Percona-Server/sql/set_var.h'
--- Percona-Server/sql/set_var.h	2013-05-15 05:05:18 +0000
+++ Percona-Server/sql/set_var.h	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
 
 /**
   @file

=== modified file 'Percona-Server/sql/share/charsets/Index.xml'
--- Percona-Server/sql/share/charsets/Index.xml	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/share/charsets/Index.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <description>

=== modified file 'Percona-Server/sql/share/charsets/armscii8.xml'
--- Percona-Server/sql/share/charsets/armscii8.xml	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/share/charsets/armscii8.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="armscii8">

=== modified file 'Percona-Server/sql/share/charsets/ascii.xml'
--- Percona-Server/sql/share/charsets/ascii.xml	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/share/charsets/ascii.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="ascii">

=== modified file 'Percona-Server/sql/share/charsets/cp1250.xml'
--- Percona-Server/sql/share/charsets/cp1250.xml	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/share/charsets/cp1250.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="cp1250">

=== modified file 'Percona-Server/sql/share/charsets/cp1256.xml'
--- Percona-Server/sql/share/charsets/cp1256.xml	2006-12-23 19:17:15 +0000
+++ Percona-Server/sql/share/charsets/cp1256.xml	2013-06-26 08:18:34 +0000
@@ -18,7 +18,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="cp1256">

=== modified file 'Percona-Server/sql/share/charsets/cp1257.xml'
--- Percona-Server/sql/share/charsets/cp1257.xml	2006-12-23 19:17:15 +0000
+++ Percona-Server/sql/share/charsets/cp1257.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="cp1257">

=== modified file 'Percona-Server/sql/share/charsets/cp850.xml'
--- Percona-Server/sql/share/charsets/cp850.xml	2006-12-23 19:17:15 +0000
+++ Percona-Server/sql/share/charsets/cp850.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="cp850">

=== modified file 'Percona-Server/sql/share/charsets/cp852.xml'
--- Percona-Server/sql/share/charsets/cp852.xml	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/share/charsets/cp852.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="cp852">

=== modified file 'Percona-Server/sql/share/charsets/cp866.xml'
--- Percona-Server/sql/share/charsets/cp866.xml	2006-12-23 19:17:15 +0000
+++ Percona-Server/sql/share/charsets/cp866.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="cp866">

=== modified file 'Percona-Server/sql/share/charsets/dec8.xml'
--- Percona-Server/sql/share/charsets/dec8.xml	2006-12-23 19:17:15 +0000
+++ Percona-Server/sql/share/charsets/dec8.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="dec8">

=== modified file 'Percona-Server/sql/share/charsets/geostd8.xml'
--- Percona-Server/sql/share/charsets/geostd8.xml	2006-12-23 19:17:15 +0000
+++ Percona-Server/sql/share/charsets/geostd8.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="geostd8">

=== modified file 'Percona-Server/sql/share/charsets/greek.xml'
--- Percona-Server/sql/share/charsets/greek.xml	2006-12-23 19:17:15 +0000
+++ Percona-Server/sql/share/charsets/greek.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="greek">

=== modified file 'Percona-Server/sql/share/charsets/hebrew.xml'
--- Percona-Server/sql/share/charsets/hebrew.xml	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/share/charsets/hebrew.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="hebrew">

=== modified file 'Percona-Server/sql/share/charsets/hp8.xml'
--- Percona-Server/sql/share/charsets/hp8.xml	2006-12-23 19:17:15 +0000
+++ Percona-Server/sql/share/charsets/hp8.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="hp8">

=== modified file 'Percona-Server/sql/share/charsets/keybcs2.xml'
--- Percona-Server/sql/share/charsets/keybcs2.xml	2006-12-23 19:17:15 +0000
+++ Percona-Server/sql/share/charsets/keybcs2.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="keybcs2">

=== modified file 'Percona-Server/sql/share/charsets/koi8r.xml'
--- Percona-Server/sql/share/charsets/koi8r.xml	2006-12-23 19:17:15 +0000
+++ Percona-Server/sql/share/charsets/koi8r.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="koi8r">

=== modified file 'Percona-Server/sql/share/charsets/koi8u.xml'
--- Percona-Server/sql/share/charsets/koi8u.xml	2006-12-23 19:17:15 +0000
+++ Percona-Server/sql/share/charsets/koi8u.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="koi8u">

=== modified file 'Percona-Server/sql/share/charsets/languages.html'
--- Percona-Server/sql/share/charsets/languages.html	2010-12-28 18:57:23 +0000
+++ Percona-Server/sql/share/charsets/languages.html	2013-06-26 08:18:34 +0000
@@ -13,7 +13,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 #<pre>
 (

=== modified file 'Percona-Server/sql/share/charsets/latin1.xml'
--- Percona-Server/sql/share/charsets/latin1.xml	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/share/charsets/latin1.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="latin1">

=== modified file 'Percona-Server/sql/share/charsets/latin2.xml'
--- Percona-Server/sql/share/charsets/latin2.xml	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/share/charsets/latin2.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="latin2">

=== modified file 'Percona-Server/sql/share/charsets/latin5.xml'
--- Percona-Server/sql/share/charsets/latin5.xml	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/share/charsets/latin5.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="latin5">

=== modified file 'Percona-Server/sql/share/charsets/latin7.xml'
--- Percona-Server/sql/share/charsets/latin7.xml	2006-12-23 19:17:15 +0000
+++ Percona-Server/sql/share/charsets/latin7.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="latin7">

=== modified file 'Percona-Server/sql/share/charsets/macce.xml'
--- Percona-Server/sql/share/charsets/macce.xml	2006-12-23 19:17:15 +0000
+++ Percona-Server/sql/share/charsets/macce.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="macce">

=== modified file 'Percona-Server/sql/share/charsets/macroman.xml'
--- Percona-Server/sql/share/charsets/macroman.xml	2006-12-23 19:17:15 +0000
+++ Percona-Server/sql/share/charsets/macroman.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="macroman">

=== modified file 'Percona-Server/sql/share/charsets/swe7.xml'
--- Percona-Server/sql/share/charsets/swe7.xml	2006-12-23 19:17:15 +0000
+++ Percona-Server/sql/share/charsets/swe7.xml	2013-06-26 08:18:34 +0000
@@ -16,7 +16,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 </copyright>
 
 <charset name="swe7">

=== modified file 'Percona-Server/sql/slave.cc'
--- Percona-Server/sql/slave.cc	2013-05-15 05:05:18 +0000
+++ Percona-Server/sql/slave.cc	2013-06-26 08:18:34 +0000
@@ -158,6 +158,37 @@
                                   volatile uint *slave_running,
                                   bool skip_lock);
 static bool check_io_slave_killed(THD *thd, Master_info *mi, const char *info);
+/*
+  Function to set the slave's max_allowed_packet based on the value
+  of slave_max_allowed_packet.
+
+    @in_param    thd    Thread handler for slave
+    @in_param    mysql  MySQL connection handle
+*/
+
+static void set_slave_max_allowed_packet(THD *thd, MYSQL *mysql)
+{
+  DBUG_ENTER("set_slave_max_allowed_packet");
+  // thd and mysql must be valid
+  DBUG_ASSERT(thd && mysql);
+
+  thd->variables.max_allowed_packet= slave_max_allowed_packet;
+  thd->net.max_packet_size= slave_max_allowed_packet;
+  /*
+    Adding MAX_LOG_EVENT_HEADER_LEN to the max_packet_size on the I/O
+    thread and the mysql->option max_allowed_packet, since a
+    replication event can become this much  larger than
+    the corresponding packet (query) sent from client to master.
+  */
+  thd->net.max_packet_size+= MAX_LOG_EVENT_HEADER;
+  /*
+    Skipping the setting of mysql->net.max_packet size to slave
+    max_allowed_packet since this is done during mysql_real_connect.
+  */
+  mysql->options.max_allowed_packet=
+    slave_max_allowed_packet+MAX_LOG_EVENT_HEADER;
+  DBUG_VOID_RETURN;
+}
 
 /*
   Find out which replications threads are running
@@ -2079,12 +2110,6 @@
     SYSTEM_THREAD_SLAVE_SQL : SYSTEM_THREAD_SLAVE_IO;
   thd->security_ctx->skip_grants();
   my_net_init(&thd->net, 0);
-/*
-  Adding MAX_LOG_EVENT_HEADER_LEN to the max_allowed_packet on all
-  slave threads, since a replication event can become this much larger
-  than the corresponding packet (query) sent from client to master.
-*/
-  thd->variables.max_allowed_packet= slave_max_allowed_packet;
   thd->slave_thread = 1;
   thd->enable_slow_log= TRUE;
   set_slave_thread_options(thd);
@@ -2835,6 +2860,14 @@
                           mi->user, mi->host, mi->port,
 			  IO_RPL_LOG_NAME,
 			  llstr(mi->master_log_pos,llbuff));
+    /*
+      Adding MAX_LOG_EVENT_HEADER_LEN to the max_packet_size on the I/O
+      thread, since a replication event can become this much larger than
+      the corresponding packet (query) sent from client to master.
+    */
+      thd->net.max_packet_size= slave_max_allowed_packet;
+      mysql->options.max_allowed_packet= thd->net.max_packet_size+= MAX_LOG_EVENT_HEADER;
+
   }
   else
   {
@@ -4231,7 +4264,7 @@
   ulong err_count=0;
   char llbuff[22];
   DBUG_ENTER("connect_to_master");
-
+  set_slave_max_allowed_packet(thd, mysql);
 #ifndef DBUG_OFF
   mi->events_till_disconnect = disconnect_slave_event_count;
 #endif
@@ -4259,13 +4292,6 @@
   mysql_options(mysql, MYSQL_SET_CHARSET_NAME, default_charset_info->csname);
   /* This one is not strictly needed but we have it here for completeness */
   mysql_options(mysql, MYSQL_SET_CHARSET_DIR, (char *) charsets_dir);
-  /*
-    Adding MAX_LOG_EVENT_HEADER_LEN to the max_packet_size on the I/O
-    thread, since a replication event can become this much larger than
-    the corresponding packet (query) sent from client to master.
-  */
-  thd->net.max_packet_size= slave_max_allowed_packet;
-  mysql->options.max_allowed_packet= thd->net.max_packet_size+= MAX_LOG_EVENT_HEADER;
 
   /* Set MYSQL_PLUGIN_DIR in case master asks for an external authentication plugin */
   if (opt_plugin_dir_ptr && *opt_plugin_dir_ptr)

=== modified file 'Percona-Server/sql/spatial.cc'
--- Percona-Server/sql/spatial.cc	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/spatial.cc	2013-06-26 08:18:34 +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
@@ -383,7 +383,7 @@
   points= uint4korr(data);
   data+= 4;
 
-  if (no_data(data, (SIZEOF_STORED_DOUBLE * 2 + offset) * points))
+  if (not_enough_points(data, points, offset))
     return 0;
 
   /* Calculate MBR for points */
@@ -466,9 +466,16 @@
 
 uint32 Gis_line_string::get_data_size() const 
 {
+  size_t n_points;
   if (no_data(m_data, 4))
     return GET_SIZE_ERROR;
-  return 4 + uint4korr(m_data) * POINT_DATA_SIZE;
+
+  n_points= uint4korr(m_data);
+
+  if (not_enough_points(m_data + 4, n_points))
+    return GET_SIZE_ERROR;
+
+  return 4 + n_points * POINT_DATA_SIZE;
 }
 
 
@@ -539,7 +546,7 @@
   data += 4;
 
   if (n_points < 1 ||
-      no_data(data, SIZEOF_STORED_DOUBLE * 2 * n_points) ||
+      not_enough_points(data, n_points) ||
       txt->reserve(((MAX_DIGITS_IN_DOUBLE + 1)*2 + 1) * n_points))
     return 1;
 
@@ -576,7 +583,7 @@
     return 1;
   n_points= uint4korr(data);
   data+= 4;
-  if (n_points < 1 || no_data(data, SIZEOF_STORED_DOUBLE * 2 * n_points))
+  if (n_points < 1 || not_enough_points(data, n_points))
     return 1;
 
   get_point(&prev_x, &prev_y, data);
@@ -610,8 +617,7 @@
     return 0;
   }
   data+= 4;
-  if (n_points == 0 ||
-      no_data(data, SIZEOF_STORED_DOUBLE * 2 * n_points))
+  if (n_points == 0 || not_enough_points(data, n_points))
     return 1;
 
   /* Get first point */
@@ -682,10 +688,18 @@
 
   while (n_linear_rings--)
   {
+    size_t n_points;
     if (no_data(data, 4))
       return GET_SIZE_ERROR;
-    data+= 4 + uint4korr(data)*POINT_DATA_SIZE;
+    n_points= uint4korr(data);
+    data+= 4;
+
+    if (not_enough_points(data, n_points))
+      return GET_SIZE_ERROR;
+
+    data+= n_points * POINT_DATA_SIZE;
   }
+
   return (uint32) (data - m_data);
 }
 
@@ -780,7 +794,8 @@
       return 1;
     n_points= uint4korr(data);
     data+= 4;
-    if (no_data(data, (SIZEOF_STORED_DOUBLE*2) * n_points) ||
+
+    if (not_enough_points(data, n_points) ||
 	txt->reserve(2 + ((MAX_DIGITS_IN_DOUBLE + 1) * 2 + 1) * n_points))
       return 1;
     txt->qs_append('(');
@@ -834,7 +849,7 @@
     if (no_data(data, 4))
       return 1;
     n_points= uint4korr(data);
-    if (no_data(data, (SIZEOF_STORED_DOUBLE*2) * n_points))
+    if (not_enough_points(data, n_points))
       return 1;
     get_point(&prev_x, &prev_y, data+4);
     data+= (4+SIZEOF_STORED_DOUBLE*2);
@@ -870,7 +885,7 @@
   n_points= uint4korr(data);
   data+= 4;
   length= n_points * POINT_DATA_SIZE;
-  if (no_data(data, length) || result->reserve(1+4+4+ length))
+  if (not_enough_points(data, n_points) || result->reserve(1+4+4+ length))
     return 1;
 
   result->q_append((char) wkb_ndr);
@@ -916,7 +931,7 @@
   n_points= uint4korr(data);
   points_size= n_points * POINT_DATA_SIZE;
   data+= 4;
-  if (no_data(data, points_size) || result->reserve(1+4+4+ points_size))
+  if (not_enough_points(data, n_points) || result->reserve(1+4+4+ points_size))