Merge lp:~laurynas-biveinis/percona-server/5.6-merge-1 into lp:percona-server/5.6

[Laurynas Biveinis]

The contents of the 2nd MP are identical to the 1st one. Resubmitting because the follow-up branch that fixes the "Needs Fixing" items has been submitted at https://code.launchpad.net/~laurynas-biveinis/percona-server/5.6-merge-1-fixes/+merge/164735.

Merge Percona Server 5.5 as of revision 460 to Percona Server 5.6. This adds all the features mentioned at https://blueprints.launchpad.net/percona-server/+spec/merge-percona-server-5.5-to-mysql-5.6 to the current 5.6 and null-merges the rest.

The commits. The number of commits was determined by wanting to null-merge some specific revisions (i.e. thread pool in 5.5) and the fact that bzr uncommit / bzr shelve/ bzr unshelve stopped working with some of the bigger revisions.

5.5 merge:

318: merge lp:percona-server/5.5 rev 397.
319: fixes to 318.
320: merge lp:percona-server/5.5 rev 444.
321: subunit2junitxml fix.
322: null-merge lp:percona-server/5.5 rev 446 (already present in 5.6: threadpool and clang fixes).
323: merge lp:percona-server/5.5 rev 460.

5.6 trunk reconciliation:

324: null-merge lp:percona-server/5.6 rev 318 (the revision that null-merged 5.5 to 5.6 originally).
325: merge lp:percona-server/5.6 rev 343.

Jenkins at http://jenkins.percona.com/job/percona-server-5.6-param/89/.

For this MP review, please set to Needs Fixing only if you see absolutely critical issues. For other issues, please review as usual and I will convert to bug reports and address them post-merge.

[Laurynas Biveinis (laurynas-biveinis)]

Two issues I have noticed myself after submitting the MP:

1) A small part of the XtraDB status vars have been either ported, either null-merged incorrectly. Vars that only exist as struct export_var_t declarations:
 ulint innodb_adaptive_hash_cells;
 ulint innodb_adaptive_hash_heap_buffers;
Vars that exists as struct export_var_t and are exported but apparently are not set:
 ulint innodb_dict_tables.

2) Null-merging the 5.5 threadpool-introducing revision was not entirely correct. A better course of action would have been reverting the contents of the merge and resolving the 5.6 threadpool file-ids instead. Now these differ, and will have to be resolved in a separate commit later.

I don't see neither issue as critical and warranting resubmission.

[Alexey Kopytov (akopytov)]

Hi Laurynas. Time is a precious resource these days, I only did a
superficial review, but here goes. I've broken comments/questions into
multiple sections for convenience.

Needs fixing:
=============

These do not necessarily block the MP and can be fixed
either in this MP or subsequent ones, as you like. I would just like to
have these fixed before the code lands in trunk:

   - many spurious copyright changes in the upstream code. Most of them
     look like merge oversights in upstream, but I don't think we should
     fix their copyrights for them :) Something like this should give
     you the list:

: bzr diff -c318 | egrep '^-.*Oracle'

   - as changes in disabled_replication.result show, we deviate from
     upstream behavior when SHOW SLAVE STATUS is run on a non-slave
     server. Upstream sends an empty row with no warnings, PS 5.6 sends
     no column metadata and a warning. Which looks like a very minor
     difference, but 1) some monitoring scripts may stop working if
     their authors are cautious about warnings and 2) there's really no
     reason to change that in PS 5.6, it looks more like an incorrect
     merge of show_slave_status_nolock

   - debug fprintf()s in sys_vars.h:

@@ -192,6 +193,9 @@
       if (SIGNED)
       {
         longlong max_val= *max_var_ptr();
+ fprintf(stderr, "v = %lld, max_val = %lld\n", v, max_val);
+ fprintf(stderr, "save_result = %lld\n",
+ (longlong)(var->save_result.ulonglong_value));

    (and a couple of more occurrences later)

   - rows_read have been removed from PROCESSLIST, but not from the slow
     query log. Which means
     https://blueprints.launchpad.net/percona-server/+spec/obsolete-rows-read-in-56
     is only partially implemented

   - incorrect PERCONA_INNODB_VERSION:

--- Percona-Server/storage/innobase/include/univ.i 2012-12-04 08:24:59 +0000
+++ Percona-Server/storage/innobase/include/univ.i 2013-05-06 15:43:51 +0000
@@ -46,6 +46,11 @@
 #define INNODB_VERSION_MINOR 2
 #define INNODB_VERSION_BUGFIX MYSQL_VERSION_PATCH

+#ifndef PERCONA_INNODB_VERSION
+#define PERCONA_INNODB_VERSION 29.3
+#endif
+

     And it is the same in 5.6-merge-3.

   - all UNIV_SRV_PRINT_LATCH_WAITS code has been removed upstream, but
     we are reintroducing it for no apparent reasons

Needs information:
==================

   - can you explain the following change?

--- Percona-Server/mysql-test/r/derived.result 2013-02-12 07:47:19 +0000
+++ Percona-Server/mysql-test/r/derived.result 2013-05-06 15:43:51 +0000
@@ -1530,7 +1530,7 @@
 heap to myisam.
 show status like 'Handler_write';
 Variable_name Value
-Handler_write 1021
+Handler_write 1011
 set @@max_heap_table_size= @save_heap_size;
 drop table t1;
 #

   - can you explain changes in
     mysql-test/suite/innodb/r/innodb_wl6347_comp_indx_stat.result ?

   - what's the story with the top-level 'internal' directory? it is
     currently missing in both 5.5 upstream and 5.6 upstream, and the
     only useful test it contains is the one for
     http://bugs.mysql.com/bug.php?id=65745.
     Was it removed in previous upstream releases, but we decided to
     keep it? Do we actually run it in MTR/Jenkins?

Nice to ha...

review: Needs Information

[Laurynas Biveinis (laurynas-biveinis)]

...2013/5/19 Alexey Kopytov <email address hidden>:
> Review: Needs Information
>
> Hi Laurynas. Time is a precious resource these days, I only did a
> superficial review, but here goes.

Thank you for your time.

> Needs fixing:
> =============
>
> These do not necessarily block the MP and can be fixed
> either in this MP or subsequent ones, as you like. I would just like to
> have these fixed before the code lands in trunk:

I am pushing lp:~laurynas-biveinis/percona-server/5.6-merge-1-fixes
with these items. From commit messages:

> - many spurious copyright changes in the upstream code. Most of them
> look like merge oversights in upstream, but I don't think we should
> fix their copyrights for them :) Something like this should give
> you the list:
>
> : bzr diff -c318 | egrep '^-.*Oracle'

Post-review fixes for the lp:percona-server/5.5 rev 397 merge to
lp:percona-server/5.6.

- Revert the spurious copyright comment changes, so that they match
  the ones at the current lp:mysql-server/5.6. Do not touch the ones
  that are fixed in the subsequent 5.6.11 merge.

> - as changes in disabled_replication.result show, we deviate from
> upstream behavior when SHOW SLAVE STATUS is run on a non-slave
> server. Upstream sends an empty row with no warnings, PS 5.6 sends
> no column metadata and a warning. Which looks like a very minor
> difference, but 1) some monitoring scripts may stop working if
> their authors are cautious about warnings and 2) there's really no
> reason to change that in PS 5.6, it looks more like an incorrect
> merge of show_slave_status_nolock

This one I did on purpose in fact. WARN_NO_MASTER_INFO seemed like the
most logical thing to return when slave is not running. Reverted.

Post-review fixes for the lp:percona-server/5.5 rev 397 merge to
lp:percona-server/5.6.

- Revert the change introduced at the porting where SHOW SLAVE STATUS
  would check whether the slave is running, and returning
  WARN_NO_MASTER_INFO warning if it's not. Re-record
  disabled_replication test to match.

> - debug fprintf()s in sys_vars.h:
> - incorrect PERCONA_INNODB_VERSION:
> - all UNIV_SRV_PRINT_LATCH_WAITS code has been removed upstream, but
> we are reintroducing it for no apparent reasons

Post-review fixes for the lp:percona-server/5.5 rev 397 merge to
lp:percona-server/5.6.

- Remove introduced-by-mistake debugging printf()s in sys_vars.h.

- Fix Percona InnoDB version in univ.i.

- Remove obsolete UNIV_SRV_PRINT_LATCH_WAITS code.

> - can you explain the following change?
>
> --- Percona-Server/mysql-test/r/derived.result 2013-02-12 07:47:19 +0000
> +++ Percona-Server/mysql-test/r/derived.result 2013-05-06 15:43:51 +0000
> @@ -1530,7 +1530,7 @@
> heap to myisam.
> show status like 'Handler_write';
> Variable_name Value
> -Handler_write 1021
> +Handler_write 1011

I didn't track it down completely, but I did track it to the MEMORY
VARCHAR support. I guess the query optimizer sees the VARCHAR support
in a temp table even without full BLOB temp table support in the
optimizer. The relevant test snippet is

--echo #
--echo # Bug#12799731 - CRASH IN END_...

[Laurynas Biveinis (laurynas-biveinis)]

Somehow I missed this comment

   - rows_read have been removed from PROCESSLIST, but not from the slow
     query log. Which means
     https://blueprints.launchpad.net/percona-server/+spec/obsolete-rows-read-in-56
     is only partially implemented

Yet the blueprint is still there, so there was no risk to miss it for the release. OK to implement on trunk?

[Alexey Kopytov (akopytov)]

Hi Laurynas,

On Mon, 20 May 2013 14:01:44 -0000, Laurynas Biveinis wrote:

> To summarize:
> - the "Needs Fixing" issues are being addressed in a follow-up branch.
> Then the merge order becomes: merge-1, merge-1-fixes, 5.6.11, merge-3.
> As soon as merge-1-fixes is approved, I will push the branches to
> trunk in this order as they are being approved;
> - the "Needs Information" issues need your OK or additional converting
> to bug reports;
> - the rest have been converted to bug db.
>

Thanks!

[Alexey Kopytov (akopytov)]

review: Approve

[Alexey Kopytov (akopytov)]

review: Approve

[Alexey Kopytov (akopytov)]

Hi Laurynas,

On Tue, 21 May 2013 08:22:28 -0000, Laurynas Biveinis wrote:
> Somehow I missed this comment
>
> - rows_read have been removed from PROCESSLIST, but not from the slow
> query log. Which means
> https://blueprints.launchpad.net/percona-server/+spec/obsolete-rows-read-in-56
> is only partially implemented
>
> Yet the blueprint is still there, so there was no risk to miss it for the release. OK to implement on trunk?
>

Yes.

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2013-05-20 14:30:50 +0000
@@ -0,0 +1,1 @@
+build
 
=== removed file '.bzrignore'
--- .bzrignore	2013-04-05 20:40:25 +0000
+++ .bzrignore	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-build
 
=== added file 'COPYING.innodb-deadlock-count-patch'
--- COPYING.innodb-deadlock-count-patch	1970-01-01 00:00:00 +0000
+++ COPYING.innodb-deadlock-count-patch	2013-05-20 14:30:50 +0000
@@ -0,0 +1,30 @@
+Portions of this software contain modifications contributed by Eric Bergen.
+These contributions are used with the following license:
+
+Copyright (c) 2010, Eric Bergen. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials
+        provided with the distribution.
+      * Neither the name of the Eric Bergen. nor the names of its
+        contributors may be used to endorse or promote products
+        derived from this software without specific prior written
+        permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
=== removed file 'COPYING.innodb-deadlock-count-patch'
--- COPYING.innodb-deadlock-count-patch	2010-12-09 18:30:58 +0000
+++ COPYING.innodb-deadlock-count-patch	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-Portions of this software contain modifications contributed by Eric Bergen.
-These contributions are used with the following license:
-
-Copyright (c) 2010, Eric Bergen. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above
-        copyright notice, this list of conditions and the following
-        disclaimer in the documentation and/or other materials
-        provided with the distribution.
-      * Neither the name of the Eric Bergen. nor the names of its
-        contributors may be used to endorse or promote products
-        derived from this software without specific prior written
-        permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
=== added file 'COPYING.show_temp_51'
--- COPYING.show_temp_51	1970-01-01 00:00:00 +0000
+++ COPYING.show_temp_51	2013-05-20 14:30:50 +0000
@@ -0,0 +1,13 @@
+Portions of this software contain modifications contributed by Venu Anuganti.
+These contributions are used with the following license:
+
+Copyright (c) 2010, Venu Anuganti, http://venublog.com/
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+    * Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
=== removed file 'COPYING.show_temp_51'
--- COPYING.show_temp_51	2010-12-09 18:30:58 +0000
+++ COPYING.show_temp_51	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Portions of this software contain modifications contributed by Venu Anuganti.
-These contributions are used with the following license:
-
-Copyright (c) 2010, Venu Anuganti, http://venublog.com/
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2013-05-20 14:30:50 +0000
@@ -0,0 +1,74 @@
+MYSQL_VERSION=5.6.10
+PERCONA_SERVER_VERSION=alpha60.2
+PERCONA_SERVER         ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
+PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
+PERCONA_SERVER_SHORT_2 ?=Percona-Server
+DEBUG_DIR ?= $(PERCONA_SERVER)-debug
+RELEASE_DIR ?= $(PERCONA_SERVER)-release
+SERIES ?=series
+
+CFLAGS=-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing
+CXXFLAGS=-fno-exceptions -fPIC -Wall -Wno-unused-parameter -fno-implicit-templates -fno-exceptions -fno-rtti -O3 -g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing
+
+CFLAGS_RELEASE=$(CFLAGS) -DDBUG_OFF -DMY_PTHREAD_FASTMUTEX=1
+CXXFLAGS_RELEASE=$(CXXFLAGS) -DDBUG_OFF -DMY_PTHREAD_FASTMUTEX=1
+
+CMAKE=CC=gcc CXX=gcc cmake $(ADDITIONAL)
+ADDITIONAL ?=
+CONFIGURE=CFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2" CXXFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"  LIBS=-lrt ./configure --prefix=/usr/local/$(PERCONA_SERVER)-$(MYSQL_VERSION) --with-plugin-innobase --with-plugin-partition
+
+REVS = $(shell bzr log | grep rev | head -1   )
+REV  = $(word 2, $(REVS) )
+
+all: main maatkit-udf install-lic
+	@echo ""
+	@echo "Percona Server source code is ready"
+	@echo "Now change directory to $(PERCONA_SERVER) define variables as show below"
+	@echo ""
+	export CFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"
+	export CXXFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"
+	export LIBS=-lrt
+	@echo ""
+	@echo "and run cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_CONFIG=mysql_release -DFEATURE_SET=community -DWITH_EMBEDDED_SERVER=OFF && make all install"
+	@echo ""
+
+maatkit-udf:
+	cp -R UDF "$(PERCONA_SERVER)"
+	cd "$(PERCONA_SERVER)"/UDF && autoreconf --install
+
+configure: all
+	(cd $(PERCONA_SERVER); bash BUILD/autorun.sh; $(CONFIGURE))
+
+cmake: cmake_release cmake_debug
+
+cmake_release:
+	rm -rf $(RELEASE_DIR)
+	(mkdir -p $(RELEASE_DIR); cd $(RELEASE_DIR); CFLAGS="$(CFLAGS_RELEASE)" CXXFLAGS="$(CXXFLAGS_RELEASE)" $(CMAKE) -G "Unix Makefiles" ../$(PERCONA_SERVER))
+
+cmake_debug:
+	rm -rf $(DEBUG_DIR)
+	(mkdir -p $(DEBUG_DIR); cd $(DEBUG_DIR); CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(CMAKE) -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DWITH_DEBUG=ON -DMYSQL_MAINTAINER_MODE=OFF ../$(PERCONA_SERVER))
+
+binary:
+	(cd $(PERCONA_SERVER); CFLAGS="$(CFLAGS_RELEASE)" CXXFLAGS="$(CXXFLAGS_RELEASE)" ${CMAKE} . -DBUILD_CONFIG=mysql_release  \
+           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	   -DCMAKE_INSTALL_PREFIX="/usr/local/$(PERCONA_SERVER)-$(MYSQL_VERSION)-$(REV)" \
+           -DFEATURE_SET="community" \
+	   -DWITH_EMBEDDED_SERVER=OFF \
+           -DCOMPILATION_COMMENT="Percona-Server" \
+           -DMYSQL_SERVER_SUFFIX="-$(REV)" )
+
+install-lic: 
+	@echo "Installing license files"
+	install -m 644 COPYING.* $(PERCONA_SERVER)
+
+prepare:
+	@echo "Prepare Percona Server sources"
+	rm -rf $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_1)
+	ln -s $(PERCONA_SERVER_SHORT_2) $(PERCONA_SERVER)
+	ln -s $(PERCONA_SERVER_SHORT_2) $(PERCONA_SERVER_SHORT_1)
+
+main: prepare
+
+clean:
+	rm -rf $(RELEASE_DIR) $(DEBUG_DIR)
 
=== removed file 'Makefile'
--- Makefile	2013-04-10 04:47:26 +0000
+++ Makefile	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-MYSQL_VERSION=5.6.10
-PERCONA_SERVER_VERSION=alpha60.2
-PERCONA_SERVER         ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
-PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
-PERCONA_SERVER_SHORT_2 ?=Percona-Server
-DEBUG_DIR ?= $(PERCONA_SERVER)-debug
-RELEASE_DIR ?= $(PERCONA_SERVER)-release
-SERIES ?=series
-
-CFLAGS=-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing
-CXXFLAGS=-fno-exceptions -fPIC -Wall -Wno-unused-parameter -fno-implicit-templates -fno-exceptions -fno-rtti -O3 -g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing
-
-CFLAGS_RELEASE=$(CFLAGS) -DDBUG_OFF -DMY_PTHREAD_FASTMUTEX=1
-CXXFLAGS_RELEASE=$(CXXFLAGS) -DDBUG_OFF -DMY_PTHREAD_FASTMUTEX=1
-
-CMAKE=CC=gcc CXX=gcc cmake $(ADDITIONAL)
-ADDITIONAL ?=
-CONFIGURE=CFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2" CXXFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"  LIBS=-lrt ./configure --prefix=/usr/local/$(PERCONA_SERVER)-$(MYSQL_VERSION) --with-plugin-innobase --with-plugin-partition
-
-REVS = $(shell bzr log | grep rev | head -1   )
-REV  = $(word 2, $(REVS) )
-
-all: main maatkit-udf install-lic misc
-	@echo ""
-	@echo "Percona Server source code is ready"
-	@echo "Now change directory to $(PERCONA_SERVER) define variables as show below"
-	@echo ""
-	export CFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"
-	export CXXFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"
-	export LIBS=-lrt
-	@echo ""
-	@echo "and run cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_CONFIG=mysql_release -DFEATURE_SET=community -DWITH_EMBEDDED_SERVER=OFF && make all install"
-	@echo ""
-
-maatkit-udf:
-	cp -R UDF "$(PERCONA_SERVER)"
-	cd "$(PERCONA_SERVER)"/UDF && autoreconf --install
-
-configure: all
-	(cd $(PERCONA_SERVER); bash BUILD/autorun.sh; $(CONFIGURE))
-
-cmake: cmake_release cmake_debug
-
-cmake_release:
-	rm -rf $(RELEASE_DIR)
-	(mkdir -p $(RELEASE_DIR); cd $(RELEASE_DIR); CFLAGS="$(CFLAGS_RELEASE)" CXXFLAGS="$(CXXFLAGS_RELEASE)" $(CMAKE) -G "Unix Makefiles" ../$(PERCONA_SERVER))
-
-cmake_debug:
-	rm -rf $(DEBUG_DIR)
-	(mkdir -p $(DEBUG_DIR); cd $(DEBUG_DIR); CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(CMAKE) -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DWITH_DEBUG=ON -DMYSQL_MAINTAINER_MODE=OFF ../$(PERCONA_SERVER))
-
-binary:
-	(cd $(PERCONA_SERVER); CFLAGS="$(CFLAGS_RELEASE)" CXXFLAGS="$(CXXFLAGS_RELEASE)" ${CMAKE} . -DBUILD_CONFIG=mysql_release  \
-           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-	   -DCMAKE_INSTALL_PREFIX="/usr/local/$(PERCONA_SERVER)-$(MYSQL_VERSION)-$(REV)" \
-           -DFEATURE_SET="community" \
-	   -DWITH_EMBEDDED_SERVER=OFF \
-           -DCOMPILATION_COMMENT="Percona-Server" \
-           -DMYSQL_SERVER_SUFFIX="-$(REV)" )
-
-install-lic: 
-	@echo "Installing license files"
-	install -m 644 COPYING.* $(PERCONA_SERVER)
-
-prepare:
-	@echo "Prepare Percona Server sources"
-	rm -rf $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_1)
-	ln -s $(PERCONA_SERVER_SHORT_2) $(PERCONA_SERVER)
-	ln -s $(PERCONA_SERVER_SHORT_2) $(PERCONA_SERVER_SHORT_1)
-
-main: prepare
-
-misc:
-	@echo "Installing other files"
-	install -m 644 lrusort.py $(PERCONA_SERVER)/scripts
-
-clean:
-	rm -rf $(RELEASE_DIR) $(DEBUG_DIR)
 
=== modified file 'Percona-Server/CMakeLists.txt'
--- Percona-Server/CMakeLists.txt	2013-03-05 12:46:43 +0000
+++ Percona-Server/CMakeLists.txt	2013-05-20 14:30:50 +0000
@@ -50,6 +50,8 @@
   MARK_AS_ADVANCED(MANUFACTURER)
 ENDIF()
 
+#PAM build Handling
+OPTION(WITH_PAM "Build with Percona PAM plugin" OFF)
 # We choose to provide WITH_DEBUG as alias to standard CMAKE_BUILD_TYPE=Debug
 # which turns out to be not trivial, as this involves synchronization 
 # between CMAKE_BUILD_TYPE and WITH_DEBUG. Besides, we have to deal with cases
@@ -254,6 +256,11 @@
 OPTION(INNODB_COMPILER_HINTS "Compile InnoDB with compiler hints" ON)
 MARK_AS_ADVANCED(INNODB_COMPILER_HINTS)
 
+IF (NOT MAX_INDEXES)
+  SET(MAX_INDEXES 64)
+ENDIF()
+SET(MAX_INDEXES ${MAX_INDEXES} CACHE STRING "Sets the maximum number of indexes per table, default 64")
+
 # Set DBUG_OFF and other optional release-only flags for non-debug project types
 FOREACH(BUILD_TYPE RELEASE RELWITHDEBINFO MINSIZEREL)
   FOREACH(LANG C CXX)
 
=== modified file 'Percona-Server/client/CMakeLists.txt'
--- Percona-Server/client/CMakeLists.txt	2013-03-05 12:46:43 +0000
+++ Percona-Server/client/CMakeLists.txt	2013-05-20 14:30:50 +0000
@@ -1,4 +1,5 @@
 # Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -63,7 +64,7 @@
 MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
 TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
 
-MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
+MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc)
 TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
 
 MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
 
=== modified file 'Percona-Server/client/client_priv.h'
--- Percona-Server/client/client_priv.h	2013-03-05 12:46:43 +0000
+++ Percona-Server/client/client_priv.h	2013-05-20 14:30:50 +0000
@@ -85,6 +85,9 @@
   OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE,
   OPT_WRITE_BINLOG, OPT_DUMP_DATE,
   OPT_INIT_COMMAND,
+#ifndef __WIN__
+  OPT_SYSLOG,
+#endif
   OPT_PLUGIN_DIR,
   OPT_DEFAULT_AUTH,
   OPT_DEFAULT_PLUGIN,
 
=== modified file 'Percona-Server/client/mysql.cc'
--- Percona-Server/client/mysql.cc	2013-04-04 09:37:28 +0000
+++ Percona-Server/client/mysql.cc	2013-05-20 14:30:50 +0000
@@ -41,6 +41,11 @@
 #include "my_readline.h"
 #include <signal.h>
 #include <violite.h>
+#ifndef __WIN__
+#include "syslog.h"
+#endif
+
+#define MAX_SYSLOG_MESSAGE 900
 
 #include <algorithm>
 
@@ -151,7 +156,7 @@
                default_pager_set= 0, opt_sigint_ignore= 0,
                auto_vertical_output= 0,
                show_warnings= 0, executing_query= 0, interrupted_query= 0,
-               ignore_spaces= 0;
+               ignore_spaces= 0, opt_syslog= 0;
 static my_bool debug_info_flag, debug_check_flag;
 static my_bool column_types_flag;
 static my_bool preserve_comments= 0;
@@ -254,6 +259,7 @@
 void tee_fputs(const char *s, FILE *file);
 void tee_puts(const char *s, FILE *file);
 void tee_putc(int c, FILE *file);
+void write_syslog(String *buffer);
 static void tee_print_sized_data(const char *, unsigned int, unsigned int, bool);
 /* The names of functions that actually do the manipulation. */
 static int get_options(int argc,char **argv);
@@ -1736,6 +1742,10 @@
   {"show-warnings", OPT_SHOW_WARNINGS, "Show warnings after every statement.",
     &show_warnings, &show_warnings, 0, GET_BOOL, NO_ARG,
     0, 0, 0, 0, 0, 0},
+#ifndef __WIN__
+  {"syslog", OPT_SYSLOG, "Logs all queries to syslog", 0, 0, 0, GET_NO_ARG,
+   NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
   {"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.",
     &opt_plugin_dir, &opt_plugin_dir, 0,
    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -1860,6 +1870,11 @@
                                     opt->name);
 #endif
     break;
+#ifndef __WIN__
+  case OPT_SYSLOG:
+    opt_syslog = 1;
+    break;
+#endif
   case OPT_SERVER_ARG:
 #ifdef EMBEDDED_LIBRARY
     /*
@@ -2297,6 +2312,40 @@
   DBUG_RETURN((COMMANDS *) 0);
 }
 
+void write_syslog(String *line){
+#ifndef __WIN__
+  uint length= line->length();
+  uint chunk_len= MY_MIN(MAX_SYSLOG_MESSAGE, length);
+  char *ptr= line->c_ptr_safe();
+  char buff[MAX_SYSLOG_MESSAGE + 1];
+
+  for (;
+       length;
+       length-= chunk_len, ptr+= chunk_len,
+           chunk_len= MY_MIN(MAX_SYSLOG_MESSAGE, length))
+  {
+    char *str;
+    if (length == chunk_len)
+      str= ptr;                                 // last chunk => skip copy
+    else
+    {
+      memcpy(buff, ptr, chunk_len);
+      buff[chunk_len]= '\0';
+      str= buff;
+    }
+    syslog(LOG_INFO,
+           "SYSTEM_USER:'%s', MYSQL_USER:'%s', CONNECTION_ID:%lu, "
+           "DB_SERVER:'%s', DB:'%s', QUERY:'%s'",
+           getenv("SUDO_USER") ? getenv("SUDO_USER") : 
+           getenv("USER") ? getenv("USER") : "--",
+           current_user ? current_user : "--",
+           mysql_thread_id(&mysql),
+           current_host ? current_host : "--",
+           current_db ? current_db : "--",
+           str);
+  }
+#endif
+}
 
 static bool add_line(String &buffer, char *line, ulong line_length,
                      char *in_string, bool *ml_comment, bool truncated)
@@ -3371,6 +3420,11 @@
     fix_history(buffer);
   }
 #endif
+#ifndef __WIN__
+  if (opt_syslog && buffer->length() && connect_flag == CLIENT_INTERACTIVE){
+    write_syslog(buffer);
+  }
+#endif
 
   buffer->length(0);
 
 
=== modified file 'Percona-Server/client/mysqldump.c'
--- Percona-Server/client/mysqldump.c	2013-03-05 12:46:43 +0000
+++ Percona-Server/client/mysqldump.c	2013-05-20 14:30:50 +0000
@@ -1927,7 +1927,9 @@
                           const char *str_create)
 {
   uint i;
+#ifndef DBUG_OFF
   my_bool body_found= 0;
+#endif
   char *create_stmt_ptr= NULL;
   ulong create_stmt_len= 0;
   MYSQL_FIELD *field;
@@ -1945,7 +1947,9 @@
       {
         create_stmt_ptr= (*row)[i];
         create_stmt_len= lengths[i];
+#ifndef DBUG_OFF
         body_found= 1;
+#endif
       }
       else
       {
@@ -2388,10 +2392,10 @@
           {
             if (opt_xml)
             {
-              if (i)                            // Procedures.
+              if (i)                            /* Procedures. */
                 print_xml_row(sql_file, "routine", routine_res, &row,
                               "Create Procedure");
-              else                              // Functions.
+              else                              /* Functions. */
                 print_xml_row(sql_file, "routine", routine_res, &row,
                               "Create Function");
               continue;
@@ -5162,7 +5166,7 @@
         if (row[1])
           fprintf(md_result_file, "MASTER_HOST='%s', ", row[1]);
         if (row[3])
-          fprintf(md_result_file, "MASTER_PORT='%s', ", row[3]);
+          fprintf(md_result_file, "MASTER_PORT=%s, ", row[3]);
       }
       fprintf(md_result_file,
               "MASTER_LOG_FILE='%s', MASTER_LOG_POS=%s;\n", row[9], row[21]);
 
=== modified file 'Percona-Server/client/sql_string.cc'
--- Percona-Server/client/sql_string.cc	2013-03-05 12:46:43 +0000
+++ Percona-Server/client/sql_string.cc	2013-05-20 14:30:50 +0000
@@ -479,6 +479,50 @@
   return FALSE;
 }
 
+bool String::append_identifier(const char *name,
+			       uint length,
+			       const CHARSET_INFO *ci,
+			       int quote_char)
+{
+  const char *name_end;
+  char q= (char)quote_char;
+  const CHARSET_INFO *lci = ci ? ci : charset();
+
+  if (quote_char == EOF)
+    return append(name, length, charset());
+
+  /*
+    The identifier must be quoted as it includes a quote character or
+   it's a keyword
+  */
+
+  (void)reserve(length*2 + 2);
+  if (append(&q, 1, lci))
+    return true;
+
+  for (name_end= name+length ; name < name_end ; name+= length)
+  {
+    uchar chr= (uchar) *name;
+    length= my_mbcharlen(lci, chr);
+    /*
+      my_mbcharlen can return 0 on a wrong multibyte
+      sequence. It is possible when upgrading from 4.0,
+      and identifier contains some accented characters.
+      The manual says it does not work. So we'll just
+      change length to 1 not to hang in the endless loop.
+    */
+    if (!length)
+      length= 1;
+    if (length == 1 && chr == (uchar) q &&
+        append(&q, 1, lci))
+      return true;
+    if (append(name, length, lci))
+      return true;
+  }
+  return append(&q, 1, lci);
+}
+
+
 uint32 String::numchars() const
 {
   return str_charset->cset->numchars(str_charset, Ptr, Ptr+str_length);
 
=== modified file 'Percona-Server/client/sql_string.h'
--- Percona-Server/client/sql_string.h	2013-03-05 12:46:43 +0000
+++ Percona-Server/client/sql_string.h	2013-05-20 14:30:50 +0000
@@ -21,6 +21,12 @@
 #include "m_ctype.h"
 #include "my_sys.h"
 
+#define QUOTED_IDENTIFIER(str_name, buf_size, q, cs, id_name, id_size) \
+	char buf_##str_name[(buf_size)]; \
+	String str_name((buf_##str_name), (buf_size), (cs)); \
+	str_name.length(0); \
+	str_name.append_identifier((id_name), (id_size), (cs), (q));
+
 class String;
 int sortcmp(const String *a,const String *b, const CHARSET_INFO *cs);
 String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);
@@ -256,6 +262,10 @@
   bool append(IO_CACHE* file, uint32 arg_length);
   bool append_with_prefill(const char *s, uint32 arg_length, 
 			   uint32 full_length, char fill_char);
+  bool append_identifier(const char *name,
+			 uint length,
+			 const CHARSET_INFO *ci,
+			 int quote_char);
   int strstr(const String &search,uint32 offset=0); // Returns offset to substring or -1
   int strrstr(const String &search,uint32 offset=0); // Returns offset to substring or -1
   bool replace(uint32 offset,uint32 arg_length,const char *to,uint32 length);
 
=== modified file 'Percona-Server/cmake/dtrace.cmake'
--- Percona-Server/cmake/dtrace.cmake	2013-03-05 12:46:43 +0000
+++ Percona-Server/cmake/dtrace.cmake	2013-05-20 14:30:50 +0000
@@ -158,7 +158,7 @@
   FOREACH(lib ${libs})
     GET_TARGET_PROPERTY(libtype ${lib} TYPE)
     IF(libtype MATCHES STATIC_LIBRARY)
-      SET(static_libs ${static_lics} ${lib})
+      SET(static_libs ${static_libs} ${lib})
     ENDIF()
   ENDFOREACH()
 
 
=== modified file 'Percona-Server/cmake/install_layout.cmake'
--- Percona-Server/cmake/install_layout.cmake	2013-03-05 12:46:43 +0000
+++ Percona-Server/cmake/install_layout.cmake	2013-05-20 14:30:50 +0000
@@ -117,7 +117,7 @@
 SET(INSTALL_SCRIPTDIR_STANDALONE        "scripts")
 #
 SET(INSTALL_LIBDIR_STANDALONE           "lib")
-SET(INSTALL_PLUGINDIR_STANDALONE        "lib/plugin")
+SET(INSTALL_PLUGINDIR_STANDALONE        "lib/mysql/plugin")
 #
 SET(INSTALL_INCLUDEDIR_STANDALONE       "include")
 #
@@ -178,7 +178,7 @@
 SET(INSTALL_SCRIPTDIR_DEB               "scripts")
 #
 SET(INSTALL_LIBDIR_DEB                  "lib")
-SET(INSTALL_PLUGINDIR_DEB               "lib/plugin")
+SET(INSTALL_PLUGINDIR_DEB               "lib/mysql/plugin")
 #
 SET(INSTALL_INCLUDEDIR_DEB              "include")
 #
 
=== modified file 'Percona-Server/config.h.cmake'
--- Percona-Server/config.h.cmake	2013-03-05 12:46:43 +0000
+++ Percona-Server/config.h.cmake	2013-05-20 14:30:50 +0000
@@ -400,7 +400,7 @@
 
 #cmakedefine HAVE_MBSTATE_T
 
-#define MAX_INDEXES 64U
+#cmakedefine MAX_INDEXES @MAX_INDEXES@
 
 #cmakedefine QSORT_TYPE_IS_VOID 1
 #cmakedefine RETQSORTTYPE @RETQSORTTYPE@
 
=== modified file 'Percona-Server/extra/comp_err.c'
--- Percona-Server/extra/comp_err.c	2013-03-05 12:46:43 +0000
+++ Percona-Server/extra/comp_err.c	2013-05-20 14:30:50 +0000
@@ -32,12 +32,13 @@
 #include <assert.h>
 #include <my_dir.h>
 
-#define MAX_ROWS  1000
+#define MAX_ROWS  5000
 #define HEADER_LENGTH 32                /* Length of header in errmsg.sys */
 #define ERRMSG_VERSION 3                /* Version number of errmsg.sys */
 #define DEFAULT_CHARSET_DIR "../sql/share/charsets"
 #define ER_PREFIX "ER_"
 #define WARN_PREFIX "WARN_"
+#define PADD_PREFIX "PADD_"
 static char *OUTFILE= (char*) "errmsg.sys";
 static char *HEADERFILE= (char*) "mysqld_error.h";
 static char *NAMEFILE= (char*) "mysqld_ername.h";
@@ -98,6 +99,7 @@
   const char *sql_code1;		/* sql state */
   const char *sql_code2;		/* ODBC state */
   struct errors *next_error;            /* Pointer to next error */
+  my_bool is_padding;                   /* If true - padd this er_name while er_code != d_code*/
   DYNAMIC_ARRAY msg;                    /* All language texts for this error */
 };
 
@@ -136,6 +138,7 @@
 
 
 static struct languages *parse_charset_string(char *str);
+static struct errors *parse_padd_string(char *ptr, int er_count);
 static struct errors *parse_error_string(char *ptr, int er_count);
 static struct message *parse_message_string(struct message *new_message,
 					    char *str);
@@ -260,6 +263,11 @@
 
   for (tmp_error= error_head; tmp_error; tmp_error= tmp_error->next_error)
   {
+    if (tmp_error->is_padding)
+    {
+      er_last= tmp_error->d_code;
+      continue;
+    }
     /*
        generating mysqld_error.h
        fprintf() will automatically add \r on windows
@@ -352,12 +360,29 @@
 		"language\n", tmp_error->er_name, tmp_lang->lang_short_name);
 	goto err;
       }
-      if (copy_rows(to, tmp->text, row_nr, start_pos))
-      {
-	fprintf(stderr, "Failed to copy rows to %s\n", outfile);
-	goto err;
-      }
-      row_nr++;
+      if (tmp_error->is_padding)
+      {
+        uint padd_to= tmp_error->d_code;
+        char* padd_message= tmp->text;
+        while ((row_nr+er_offset) < padd_to)
+        {
+          if (copy_rows(to, padd_message,row_nr,start_pos))
+          {
+            fprintf(stderr, "Failed to copy rows to %s\n", outfile);
+            goto err;
+          }
+          row_nr++;
+        }
+      }
+      else
+      {
+        if (copy_rows(to, tmp->text, row_nr, start_pos))
+        {
+          fprintf(stderr, "Failed to copy rows to %s\n", outfile);
+          goto err;
+        }
+        row_nr++;
+      }
     }
 
     /* continue with header of the errmsg.sys file */
@@ -508,14 +533,26 @@
 	DBUG_RETURN(0);
       continue;
     }
-    if (is_prefix(str, ER_PREFIX) || is_prefix(str, WARN_PREFIX))
+    if (is_prefix(str, ER_PREFIX) || is_prefix(str, WARN_PREFIX) || is_prefix(str, PADD_PREFIX))
     {
-      if (!(current_error= parse_error_string(str, rcount)))
-      {
-	fprintf(stderr, "Failed to parse the error name string\n");
-	DBUG_RETURN(0);
-      }
-      rcount++;                         /* Count number of unique errors */
+      if (is_prefix(str, PADD_PREFIX))
+      {
+        if (!(current_error= parse_padd_string(str, rcount)))
+        {
+          fprintf(stderr, "Failed to parse the error pad string\n");
+          DBUG_RETURN(0);
+        }
+        rcount= current_error->d_code - er_offset;  /* Count number of unique errors */
+      }
+      else
+      {
+        if (!(current_error= parse_error_string(str, rcount)))
+        {
+          fprintf(stderr, "Failed to parse the error name string\n");
+          DBUG_RETURN(0);
+        }
+        rcount++;                         /* Count number of unique errors */
+      }
 
       /* add error to the list */
       *tail_error= current_error;
@@ -856,78 +893,122 @@
   DBUG_RETURN(new_message);
 }
 
-
-/*
-  Parsing the string with error name and codes; returns the pointer to
-  the errors struct
-*/
-
-static struct errors *parse_error_string(char *str, int er_count)
+static struct errors* create_new_error(my_bool is_padding, char *er_name, int d_code, const char *sql_code1, const char *sql_code2)
 {
   struct errors *new_error;
-  DBUG_ENTER("parse_error_string");
-  DBUG_PRINT("enter", ("str: %s", str));
-
+  DBUG_ENTER("create_new_error");
   /* create a new element */
   new_error= (struct errors *) my_malloc(sizeof(*new_error), MYF(MY_WME));
-
   if (my_init_dynamic_array(&new_error->msg, sizeof(struct message), 0, 0))
     DBUG_RETURN(0);				/* OOM: Fatal error */
-
-  /* getting the error name */
-  str= skip_delimiters(str);
-
-  if (!(new_error->er_name= get_word(&str)))
-    DBUG_RETURN(0);				/* OOM: Fatal error */
-  DBUG_PRINT("info", ("er_name: %s", new_error->er_name));
+  new_error->is_padding= is_padding;
+  DBUG_PRINT("info", ("is_padding: %s", (is_padding ? "true" : "false")));
+  new_error->er_name= er_name;
+  DBUG_PRINT("info", ("er_name: %s", er_name));
+  new_error->d_code= d_code;
+  DBUG_PRINT("info", ("d_code: %d", d_code));
+  new_error->sql_code1= sql_code1;
+  DBUG_PRINT("info", ("sql_code1: %s", sql_code1));
+  new_error->sql_code2= sql_code2;
+  DBUG_PRINT("info", ("sql_code2: %s", sql_code2));
+  DBUG_RETURN(new_error);
+}
+
+/*
+  Parsing the string with padd syntax (name + error to pad); returns the pointer to
+  the errors struct
+*/
+
+static struct errors *parse_padd_string(char* str, int er_count)
+{
+  char *er_name;
+  uint d_code;
+  char *start;
+  DBUG_ENTER("parse_error_string");
+  DBUG_PRINT("enter", ("str: %s", str));
+
+  start= str;
+  str= skip_delimiters(str);
+
+  /* getting the error name */
+
+  if (!(er_name= get_word(&str)))
+    DBUG_RETURN(0);				/* OOM: Fatal error */
+
+  str= skip_delimiters(str);
+
+  if (!(d_code= parse_error_offset(start)))
+  {
+    fprintf(stderr, "Failed to parse the error pad string '%s' '%s' (d_code doesn't parse)!\n",er_name,str);
+    DBUG_RETURN(0);
+  }
+  if (d_code < (uint)(er_offset + er_count))
+  {
+    fprintf(stderr, "Error to padding less current error number!\n");
+    DBUG_RETURN(0);
+  }
+  DBUG_RETURN(create_new_error(TRUE,er_name,d_code,empty_string,empty_string));
+}
+
+/*
+  Parsing the string with error name and codes; returns the pointer to
+  the errors struct
+*/
+
+static struct errors *parse_error_string(char *str, int er_count)
+{
+  char *er_name;
+  int d_code;
+  const char *sql_code1= empty_string;
+  const char *sql_code2= empty_string;
+  DBUG_ENTER("parse_error_string");
+  DBUG_PRINT("enter", ("str: %s", str));
+
+  str= skip_delimiters(str);
+
+  /* getting the error name */
+
+  if (!(er_name= get_word(&str)))
+    DBUG_RETURN(0);				/* OOM: Fatal error */
 
   str= skip_delimiters(str);
 
   /* getting the code1 */
-
-  new_error->d_code= er_offset + er_count;
-  DBUG_PRINT("info", ("d_code: %d", new_error->d_code));
+  d_code= er_offset + er_count;
 
   str= skip_delimiters(str);
 
   /* if we reached EOL => no more codes, but this can happen */
   if (!*str)
   {
-    new_error->sql_code1= empty_string;
-    new_error->sql_code2= empty_string;
     DBUG_PRINT("info", ("str: %s", str));
-    DBUG_RETURN(new_error);
+    goto complete_create;
   }
-
   /* getting the sql_code 1 */
-
-  if (!(new_error->sql_code1= get_word(&str)))
+  if (!(sql_code1= get_word(&str)))
     DBUG_RETURN(0);				/* OOM: Fatal error */
-  DBUG_PRINT("info", ("sql_code1: %s", new_error->sql_code1));
 
   str= skip_delimiters(str);
 
   /* if we reached EOL => no more codes, but this can happen */
   if (!*str)
   {
-    new_error->sql_code2= empty_string;
     DBUG_PRINT("info", ("str: %s", str));
-    DBUG_RETURN(new_error);
+    goto complete_create;
   }
-
   /* getting the sql_code 2 */
-  if (!(new_error->sql_code2= get_word(&str)))
+  if (!(sql_code2= get_word(&str)))
     DBUG_RETURN(0);				/* OOM: Fatal error */
-  DBUG_PRINT("info", ("sql_code2: %s", new_error->sql_code2));
 
   str= skip_delimiters(str);
+
   if (*str)
   {
     fprintf(stderr, "The error line did not end with sql/odbc code!");
     DBUG_RETURN(0);
   }
-
-  DBUG_RETURN(new_error);
+complete_create:
+  DBUG_RETURN(create_new_error(FALSE,er_name,d_code,sql_code1,sql_code2));
 }
 
 
 
=== modified file 'Percona-Server/extra/innochecksum.cc'
--- Percona-Server/extra/innochecksum.cc	2013-03-05 12:46:43 +0000
+++ Percona-Server/extra/innochecksum.cc	2013-05-20 14:30:50 +0000
@@ -44,12 +44,24 @@
 #include "univ.i"                /*  include all of this */
 
 #include "buf0checksum.h"        /* buf_calc_page_*() */
+#include "dict0mem.h"            /* DICT_TF_BITS et al */
 #include "fil0fil.h"             /* FIL_* */
 #include "fsp0fsp.h"             /* fsp_flags_get_page_size() &
                                     fsp_flags_get_zip_size() */
 #include "mach0data.h"           /* mach_read_from_4() */
 #include "ut0crc32.h"            /* ut_crc32_init() */
 
+/** Smallest compressed page size */
+#define PAGE_ZIP_MIN_SIZE       (1 << 10)
+
+#define DICT_TF_FORMAT_SHIFT            5       /* file format */
+#define DICT_TF_FORMAT_MASK                                             \
+    ((~(~0 << (DICT_TF_BITS - DICT_TF_FORMAT_SHIFT))) << DICT_TF_FORMAT_SHIFT)
+#define DICT_TF_FORMAT_51               0       /*!< InnoDB/MySQL up to 5.1 */
+#define DICT_TF_FORMAT_ZIP              1       /*!< InnoDB plugin for 5.1:
+                                                  compressed tables,
+                                                  new BLOB treatment */
+
 #ifdef UNIV_NONINL
 # include "fsp0fsp.ic"
 # include "mach0data.ic"
@@ -65,6 +77,7 @@
 static ulong do_page;
 static my_bool use_end_page;
 static my_bool do_one_page;
+static my_bool display_format;
 ulong srv_page_size;              /* replaces declaration in srv0srv.c */
 static ulong physical_page_size;  /* Page size in bytes on disk. */
 static ulong logical_page_size;   /* Page size when uncompressed. */
@@ -130,6 +143,8 @@
     &debug, &debug, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"count", 'c', "Print the count of pages in the file.",
     &just_count, &just_count, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"format_info", 'f', "Display information about the file format and exit",
+    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"start_page", 's', "Start on this page number (0 based).",
     &start_page, &start_page, 0, GET_ULONG, REQUIRED_ARG,
     0, 0, (longlong) 2L*1024L*1024L*1024L, 0, 1, 0},
@@ -174,6 +189,9 @@
   case 'e':
     use_end_page= 1;
     break;
+  case 'f':
+    display_format= 1;
+    break;
   case 'p':
     end_page= start_page= do_page;
     use_end_page= 1;
@@ -211,6 +229,54 @@
   return 0;
 } /* get_options */
 
+static
+void
+display_format_info(uchar *page)
+{
+  ulint page_type;
+  ulint flags;
+
+  /* Read page type. Pre-5.1.7 InnoDB always have zero in FIL_PAGE_TYPE for the
+  first page, later versions initialize it to FIL_PAGE_TYPE_FSP_HDR. */
+  page_type= mach_read_from_2(page + FIL_PAGE_TYPE);
+
+  /* Read FSP flags from the page header. */
+  flags = mach_read_from_4(page + FSP_HEADER_OFFSET + FSP_SPACE_FLAGS);
+
+  if (!page_type)
+  {
+    printf("Detected file format: Antelope (pre-5.1.7).\n");
+    if (flags != 0) {
+      printf("But FSP_SPACE_FLAGS is non-zero: %lu. Corrupted tablespace?\n",
+              flags);
+    }
+  }
+  else if (page_type == FIL_PAGE_TYPE_FSP_HDR)
+  {
+    ulint format = flags & DICT_TF_FORMAT_MASK >> DICT_TF_FORMAT_SHIFT;
+    ulint zip_size = fsp_flags_get_zip_size(flags);
+
+    if (!flags)
+    {
+      printf("Detected file format: Antelope (5.1.7 or newer).\n");
+    }
+    else if (format == DICT_TF_FORMAT_ZIP)
+    {
+      printf("Detected file format: Barracuda ");
+      if (!zip_size)
+        printf("(not compressed).\n");
+      else
+        printf("(compressed with KEY_BLOCK_SIZE=%lu).\n", zip_size);
+    }
+    else
+      printf("Unknown file format: %lu\n", format);
+  }
+  else
+  {
+    printf("Bogus FIL_PAGE_TYPE value: %lu. Cannot detect the file format.\n",
+           page_type);
+  }
+}
 
 int main(int argc, char **argv)
 {
@@ -296,8 +362,9 @@
       printf("InnoChecksum; checking pages in range %lu to %lu\n", start_page, use_end_page ? end_page : (pages - 1));
   }
 
-  /* seek to the necessary position */
-  if (start_page)
+  /* seek to the necessary position, ignore with -f as we only need to read the
+  first page */
+  if (start_page && !display_format)
   {
     fd= fileno(f);
     if (!fd)
@@ -336,6 +403,13 @@
       return 1;
     }
 
+    if (display_format)
+    {
+      /* for -f, analyze only the first page and exit */
+      display_format_info(buf);
+      return 0;
+    }
+
     /* check the "stored log sequence numbers" */
     logseq= mach_read_from_4(buf + FIL_PAGE_LSN + 4);
     logseqfield= mach_read_from_4(buf + logical_page_size - FIL_PAGE_END_LSN_OLD_CHKSUM + 4);
 
=== modified file 'Percona-Server/include/atomic/x86-gcc.h'
--- Percona-Server/include/atomic/x86-gcc.h	2013-03-05 12:46:43 +0000
+++ Percona-Server/include/atomic/x86-gcc.h	2013-05-20 14:30:50 +0000
@@ -108,27 +108,23 @@
   v=tmp;
 
 /*
-  On some platforms (e.g. Mac OS X and Solaris) the ebx register
-  is held as a pointer to the global offset table. Thus we're not
-  allowed to use the b-register on those platforms when compiling
-  PIC code, to avoid this we push ebx and pop ebx. The new value
-  is copied directly from memory to avoid problems with a implicit
-  manipulation of the stack pointer by the push.
-
   cmpxchg8b works on both 32-bit platforms and 64-bit platforms but
   the code here is only used on 32-bit platforms, on 64-bit
   platforms the much simpler make_atomic_cas_body32 will work
   fine.
 */
-#define make_atomic_cas_body64                                    \
-  asm volatile ("push %%ebx;"                                     \
-                "movl (%%ecx), %%ebx;"                            \
-                "movl 4(%%ecx), %%ecx;"                           \
-                LOCK_prefix "; cmpxchg8b %0;"                     \
-                "setz %2; pop %%ebx"                              \
-                : "=m" (*a), "+A" (*cmp), "=c" (ret)              \
-                : "c" (&set), "m" (*a)                            \
-                : "memory", "esp")
+#define make_atomic_cas_body64                                     \
+  asm volatile ("movl %%edi, -4(%%esp);"                           \
+                "leal %0, %%edi;"                                  \
+                "xchgl %%ebx, %%esi;"                              \
+                LOCK_prefix "; cmpxchg8b (%%edi);"                 \
+                "movl %%esi, %%ebx;"                               \
+                "movl -4(%%esp), %%edi;"                           \
+                "setz %1;"                                         \
+                : "+m" (*a), "=q" (ret), "+A" (*cmp)               \
+                : "S" ((int32)(set & 0xFFFFFFFF)),                 \
+                  "c" ((int32)(set >> 32))                         \
+                : "memory", "flags")
 #endif
 
 /*
 
=== modified file 'Percona-Server/include/heap.h'
--- Percona-Server/include/heap.h	2013-03-05 12:46:43 +0000
+++ Percona-Server/include/heap.h	2013-05-20 14:30:50 +0000
@@ -34,7 +34,17 @@
 #include "my_compare.h"
 #include "my_tree.h"
 
-	/* defines used by heap-funktions */
+/* Define index limits to be identical to MyISAM ones for compatibility. */
+
+#if MAX_INDEXES > HA_MAX_POSSIBLE_KEY
+#define HP_MAX_KEY                  HA_MAX_POSSIBLE_KEY /* Max allowed keys */
+#else
+#define HP_MAX_KEY                  MAX_INDEXES         /* Max allowed keys */
+#endif
+
+#define HP_MAX_KEY_LENGTH           1000            /* Max length in bytes */
+
+/* defines used by heap-funktions */
 
 #define HP_MAX_LEVELS	4		/* 128^5 records is enough */
 #define HP_PTRS_IN_NOD	128
@@ -131,22 +141,58 @@
   uint (*get_key_length)(struct st_hp_keydef *keydef, const uchar *key);
 } HP_KEYDEF;
 
+typedef struct st_heap_columndef		/* column information */
+{
+  int16  type;	  			/* en_fieldtype */
+  uint32 length;		  	/* length of field */
+  uint32 offset;		  	/* Offset to position in row */
+  uint8  null_bit;			/* If column may be 0 */
+  uint16 null_pos;			/* position for null marker */
+  uint8  length_bytes;			/* length of the size, 1 o 2 bytes */
+} HP_COLUMNDEF;
+
+typedef struct st_heap_dataspace   /* control data for data space */
+{
+  HP_BLOCK block;
+  /* Total chunks ever allocated in this dataspace */
+  uint chunk_count;
+  uint del_chunk_count;         /* Deleted chunks count */
+  uchar *del_link;              /* Link to last deleted chunk */
+  uint chunk_length;            /* Total length of one chunk */
+  /* Length of payload that will be placed into one chunk */
+  uint chunk_dataspace_length;
+  /* Offset of the status flag relative to the chunk start */
+  uint offset_status;
+  /* Offset of the linking pointer relative to the chunk start */
+  uint offset_link;
+  /* Test whether records have variable size and so "next" pointer */
+  uint is_variable_size;
+  /* Total size allocated within this data space */
+  ulonglong total_data_length;
+} HP_DATASPACE;
+
 typedef struct st_heap_share
 {
-  HP_BLOCK block;
   HP_KEYDEF  *keydef;
+  HP_COLUMNDEF *column_defs;
+  /* Describes "block", which contains actual records */
+  HP_DATASPACE recordspace;
   ulong min_records,max_records;	/* Params to open */
-  ulonglong data_length,index_length,max_table_size;
+  ulonglong index_length, max_table_size;
   uint key_stat_version;                /* version to indicate insert/delete */
-  uint records;				/* records */
-  uint blength;				/* records rounded up to 2^n */
-  uint deleted;				/* Deleted records in database */
-  uint reclength;			/* Length of one record */
+  uint records;			/* Actual record (row) count */
+  uint blength;			/* used_chunk_count rounded up to 2^n */
+  /*
+    Length of record's fixed part, which contains keys and always fits into the
+    first chunk.
+  */
+  uint fixed_data_length;
+  uint fixed_column_count;  /* Number of columns stored in fixed_data_length */
   uint changed;
   uint keys,max_key_length;
+  uint column_count;
   uint currently_disabled_keys;    /* saved value from "keys" when disabled */
   uint open_count;
-  uchar *del_link;			/* Link to next block with del. rec */
   char * name;			/* Name of "memory-file" */
   time_t create_time;
   THR_LOCK lock;
@@ -156,6 +202,7 @@
   uint auto_key;
   uint auto_key_type;			/* real type of the auto key segment */
   ulonglong auto_increment;
+  uint blobs;  /* Number of blobs in table */
 } HP_SHARE;
 
 struct st_hp_hash_info;
@@ -165,7 +212,7 @@
   HP_SHARE *s;
   uchar *current_ptr;
   struct st_hp_hash_info *current_hash_ptr;
-  ulong current_record,next_block;
+  ulong current_record;
   int lastinx,errkey;
   int  mode;				/* Mode of file (READONLY..) */
   uint opt_flag,update;
@@ -178,6 +225,9 @@
   my_bool implicit_emptied;
   THR_LOCK_DATA lock;
   LIST open_list;
+  uchar *blob_buffer;  /* Temporary buffer used to return BLOB values */
+  uint blob_size;      /* Current blob_buffer size */
+  uint blob_offset;    /* Current offset in blob_buffer */
 } HP_INFO;
 
 
@@ -199,6 +249,14 @@
     open_count to 1. Is only looked at if not internal_table.
   */
   my_bool pin_share;
+  uint columns;
+  HP_COLUMNDEF *columndef;
+  uint fixed_key_fieldnr;
+  uint fixed_data_size;
+  uint keys_memory_size;
+  uint max_chunk_size;
+  uint is_dynamic;
+  uint blobs;
 } HP_CREATE_INFO;
 
 	/* Prototypes for heap-functions */
@@ -215,9 +273,8 @@
 extern int heap_scan(register HP_INFO *info, uchar *record);
 extern int heap_delete(HP_INFO *info,const uchar *buff);
 extern int heap_info(HP_INFO *info,HEAPINFO *x,int flag);
-extern int heap_create(const char *name,
-                       HP_CREATE_INFO *create_info, HP_SHARE **share,
-                       my_bool *created_new_share);
+extern int heap_create(const char *name, HP_CREATE_INFO *create_info,
+                       HP_SHARE **res, my_bool *created_new_share);
 extern int heap_delete_table(const char *name);
 extern void heap_drop_table(HP_INFO *info);
 extern int heap_extra(HP_INFO *info,enum ha_extra_function function);
 
=== modified file 'Percona-Server/include/m_string.h'
--- Percona-Server/include/m_string.h	2013-03-05 12:46:43 +0000
+++ Percona-Server/include/m_string.h	2013-05-20 14:30:50 +0000
@@ -251,6 +251,45 @@
    @return          the last non-space character
 */
 
+#ifdef __x86_64__
+
+#if SIZEOF_LONG != 8
+# error "SIZEOF_LONG != 8"
+#endif
+
+/* Modern x86_64 CPUs do not have penalties for unaligned access */
+
+static inline const uchar *skip_trailing_space(const uchar *ptr, size_t len)
+{
+  const uchar *begin;
+  ulong UNINIT_VAR(val);
+
+  if (unlikely(ptr == NULL))
+    return NULL;
+
+  begin= ptr;
+  ptr= ptr + len - 8;
+
+  while (ptr >= begin && (val= (*(ulong *) ptr) ^ 0x2020202020202020) == 0)
+    ptr-= 8;
+
+  if (likely(ptr >= begin))
+  {
+    do {
+      ptr++;
+    } while (val>>= 8);
+
+    return ptr;
+  }
+
+  for (ptr= ptr + 8; ptr > begin && ptr[-1] == 0x20; ptr--)
+    /* empty */;
+
+  return ptr;
+}
+
+#else
+
 static inline const uchar *skip_trailing_space(const uchar *ptr,size_t len)
 {
   const uchar *end= ptr + len;
@@ -276,6 +315,7 @@
     end--;
   return (end);
 }
+#endif
 
 static inline void lex_string_set(LEX_STRING *lex_str, const char *c_str)
 {
 
=== modified file 'Percona-Server/include/my_getopt.h'
--- Percona-Server/include/my_getopt.h	2013-03-05 12:46:43 +0000
+++ Percona-Server/include/my_getopt.h	2013-05-20 14:30:50 +0000
@@ -128,6 +128,24 @@
 my_bool getopt_compare_strings(const char *s, const char *t, uint length);
 ulonglong max_of_int_range(int var_type);
 
+/* Get the specific range constraint for the value named. If you do not
+   have the name length availa ble, specify 0. Specify 0 for 'create' to
+   simply obtain the existong value or specify a size value to have the
+   storage allocated if it does not yet exist. */
+extern const void* getopt_constraint_get_max_value(const char *name,
+                                                   size_t length,
+                                                   size_t create);
+extern const void* getopt_constraint_get_min_value(const char *name,
+                                                   size_t length,
+                                                   size_t create);
+extern const my_bool* getopt_constraint_get_hidden_value(const char *name,
+                                                         size_t length,
+                                                         my_bool create);
+extern const my_bool* getopt_constraint_get_readonly_value(const char *name,
+                                                           size_t length,
+                                                           my_bool create);
+
+
 C_MODE_END
 
 #endif /* _my_getopt_h */
 
=== modified file 'Percona-Server/include/my_sys.h'
--- Percona-Server/include/my_sys.h	2013-03-05 12:46:43 +0000
+++ Percona-Server/include/my_sys.h	2013-05-20 14:30:50 +0000
@@ -346,8 +346,8 @@
 typedef struct st_dynamic_array
 {
   uchar *buffer;
-  uint elements,max_element;
-  uint alloc_increment;
+  ulong elements, max_element;
+  ulong alloc_increment;
   uint size_of_element;
 } DYNAMIC_ARRAY;
 
@@ -788,6 +788,7 @@
 				 const char *prefix, size_t cache_size,
 				 myf cache_myflags);
 extern my_bool real_open_cached_file(IO_CACHE *cache);
+extern my_bool truncate_cached_file(IO_CACHE *cache, my_off_t pos);
 extern void close_cached_file(IO_CACHE *cache);
 File create_temp_file(char *to, const char *dir, const char *pfx,
 		      int mode, myf MyFlags);
@@ -796,22 +797,23 @@
 #define my_init_dynamic_array2(A,B,C,D,E) init_dynamic_array2(A,B,C,D,E)
 #define my_init_dynamic_array2_ci(A,B,C,D,E) init_dynamic_array2(A,B,C,D,E)
 extern my_bool init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size,
-                                   void *init_buffer, uint init_alloc,
-                                   uint alloc_increment);
+                                   void *init_buffer, ulong init_alloc,
+                                   ulong alloc_increment);
 /* init_dynamic_array() function is deprecated */
 extern my_bool init_dynamic_array(DYNAMIC_ARRAY *array, uint element_size,
-                                  uint init_alloc, uint alloc_increment);
+                                  ulong init_alloc, ulong alloc_increment);
 extern my_bool insert_dynamic(DYNAMIC_ARRAY *array, const void *element);
 extern void *alloc_dynamic(DYNAMIC_ARRAY *array);
 extern void *pop_dynamic(DYNAMIC_ARRAY*);
 extern my_bool set_dynamic(DYNAMIC_ARRAY *array, const void *element,
-                           uint array_index);
-extern my_bool allocate_dynamic(DYNAMIC_ARRAY *array, uint max_elements);
+                           ulong idx);
+extern my_bool allocate_dynamic(DYNAMIC_ARRAY *array, ulong max_elements);
 extern void get_dynamic(DYNAMIC_ARRAY *array, void *element,
-                        uint array_index);
+                        ulong idx);
 extern void delete_dynamic(DYNAMIC_ARRAY *array);
-extern void delete_dynamic_element(DYNAMIC_ARRAY *array, uint array_index);
+extern void delete_dynamic_element(DYNAMIC_ARRAY *array, ulong array_index);
 extern void freeze_size(DYNAMIC_ARRAY *array);
+extern long get_index_dynamic(DYNAMIC_ARRAY *array, const void *element);
 #define dynamic_array_ptr(array,array_index) ((array)->buffer+(array_index)*(array)->size_of_element)
 #define dynamic_element(array,array_index,type) ((type)((array)->buffer) +(array_index))
 #define push_dynamic(A,B) insert_dynamic((A),(B))
 
=== modified file 'Percona-Server/include/mysql/plugin.h'
--- Percona-Server/include/mysql/plugin.h	2013-03-05 12:46:43 +0000
+++ Percona-Server/include/mysql/plugin.h	2013-05-20 14:30:50 +0000
@@ -552,6 +552,22 @@
 /* Increments the row counter, see THD::row_count */
 void thd_inc_row_count(MYSQL_THD thd);
 
+void increment_thd_innodb_stats(MYSQL_THD thd,
+                    unsigned long long trx_id,
+                    long io_reads,
+                    long long io_read,
+                    long io_reads_wait_timer,
+                    long lock_que_wait_timer,
+                    long que_wait_timer,
+                    long page_access);
+unsigned long thd_log_slow_verbosity(const MYSQL_THD thd);
+int thd_opt_slow_log();
+#define EXTENDED_SLOWLOG
+
+#define EXTENDED_FOR_USERSTAT
+
+#define EXTENDED_FOR_COMMIT_ORDERED
+
 /**
   Create a temporary file.
 
@@ -656,6 +672,12 @@
 */
 void thd_set_ha_data(MYSQL_THD thd, const struct handlerton *hton,
                      const void *ha_data);
+
+int thd_command(const MYSQL_THD thd);
+long long thd_start_time(const MYSQL_THD thd);
+void thd_kill(unsigned long id);
+#define EXTENDED_FOR_KILLIDLE
+
 #ifdef __cplusplus
 }
 #endif
 
=== modified file 'Percona-Server/include/mysql/plugin_audit.h.pp'
--- Percona-Server/include/mysql/plugin_audit.h.pp	2013-03-05 12:46:43 +0000
+++ Percona-Server/include/mysql/plugin_audit.h.pp	2013-05-20 14:30:50 +0000
@@ -233,6 +233,16 @@
 char *thd_security_context(void* thd, char *buffer, unsigned int length,
                            unsigned int max_query_len);
 void thd_inc_row_count(void* thd);
+void increment_thd_innodb_stats(void* thd,
+                    unsigned long long trx_id,
+                    long io_reads,
+                    long long io_read,
+                    long io_reads_wait_timer,
+                    long lock_que_wait_timer,
+                    long que_wait_timer,
+                    long page_access);
+unsigned long thd_log_slow_verbosity(const void* thd);
+int thd_opt_slow_log();
 int mysql_tmpfile(const char *prefix);
 int thd_killed(const void* thd);
 void thd_binlog_pos(const void* thd,
@@ -246,6 +256,9 @@
 void *thd_get_ha_data(const void* thd, const struct handlerton *hton);
 void thd_set_ha_data(void* thd, const struct handlerton *hton,
                      const void *ha_data);
+int thd_command(const void* thd);
+long long thd_start_time(const void* thd);
+void thd_kill(unsigned long id);
 struct mysql_event_general
 {
   unsigned int event_subclass;
 
=== modified file 'Percona-Server/include/mysql/plugin_auth.h.pp'
--- Percona-Server/include/mysql/plugin_auth.h.pp	2013-03-05 12:46:43 +0000
+++ Percona-Server/include/mysql/plugin_auth.h.pp	2013-05-20 14:30:50 +0000
@@ -233,6 +233,16 @@
 char *thd_security_context(void* thd, char *buffer, unsigned int length,
                            unsigned int max_query_len);
 void thd_inc_row_count(void* thd);
+void increment_thd_innodb_stats(void* thd,
+                    unsigned long long trx_id,
+                    long io_reads,
+                    long long io_read,
+                    long io_reads_wait_timer,
+                    long lock_que_wait_timer,
+                    long que_wait_timer,
+                    long page_access);
+unsigned long thd_log_slow_verbosity(const void* thd);
+int thd_opt_slow_log();
 int mysql_tmpfile(const char *prefix);
 int thd_killed(const void* thd);
 void thd_binlog_pos(const void* thd,
@@ -246,6 +256,9 @@
 void *thd_get_ha_data(const void* thd, const struct handlerton *hton);
 void thd_set_ha_data(void* thd, const struct handlerton *hton,
                      const void *ha_data);
+int thd_command(const void* thd);
+long long thd_start_time(const void* thd);
+void thd_kill(unsigned long id);
 #include <mysql/plugin_auth_common.h>
 typedef struct st_plugin_vio_info
 {
 
=== modified file 'Percona-Server/include/mysql/plugin_ftparser.h.pp'
--- Percona-Server/include/mysql/plugin_ftparser.h.pp	2013-03-05 12:46:43 +0000
+++ Percona-Server/include/mysql/plugin_ftparser.h.pp	2013-05-20 14:30:50 +0000
@@ -186,6 +186,16 @@
 char *thd_security_context(void* thd, char *buffer, unsigned int length,
                            unsigned int max_query_len);
 void thd_inc_row_count(void* thd);
+void increment_thd_innodb_stats(void* thd,
+                    unsigned long long trx_id,
+                    long io_reads,
+                    long long io_read,
+                    long io_reads_wait_timer,
+                    long lock_que_wait_timer,
+                    long que_wait_timer,
+                    long page_access);
+unsigned long thd_log_slow_verbosity(const void* thd);
+int thd_opt_slow_log();
 int mysql_tmpfile(const char *prefix);
 int thd_killed(const void* thd);
 void thd_binlog_pos(const void* thd,
@@ -199,6 +209,9 @@
 void *thd_get_ha_data(const void* thd, const struct handlerton *hton);
 void thd_set_ha_data(void* thd, const struct handlerton *hton,
                      const void *ha_data);
+int thd_command(const void* thd);
+long long thd_start_time(const void* thd);
+void thd_kill(unsigned long id);
 enum enum_ftparser_mode
 {
   MYSQL_FTPARSER_SIMPLE_MODE= 0,
 
=== modified file 'Percona-Server/include/mysql_com.h'
--- Percona-Server/include/mysql_com.h	2013-03-05 12:46:43 +0000
+++ Percona-Server/include/mysql_com.h	2013-05-20 14:30:50 +0000
@@ -31,6 +31,7 @@
 
 #define SERVER_VERSION_LENGTH 60
 #define SQLSTATE_LENGTH 5
+#define LIST_PROCESS_HOST_LEN 64
 
 /*
   Maximum length of comments
@@ -153,6 +154,20 @@
 #define REFRESH_DES_KEY_FILE	0x40000L
 #define REFRESH_USER_RESOURCES	0x80000L
 #define REFRESH_FOR_EXPORT      0x100000L /* FLUSH TABLES ... FOR EXPORT */
+#define REFRESH_TABLE_STATS     0x200000L /* Refresh table stats my_hash
+                                             table */
+#define REFRESH_INDEX_STATS     0x400000L /* Refresh index stats my_hash
+                                             table */
+#define REFRESH_USER_STATS      0x800000L /* Refresh user stats my_hash
+                                             table */
+#define REFRESH_CLIENT_STATS    0x1000000L /* Refresh client stats my_hash
+                                              table */
+#define REFRESH_THREAD_STATS    0x2000000L /* Refresh thread stats my_hash
+                                              table */
+#define REFRESH_FLUSH_PAGE_BITMAPS 0x400000L
+#define REFRESH_RESET_PAGE_BITMAPS 0x800000L
+
+#define PURGE_BITMAPS_TO_LSN 1
 
 #define CLIENT_LONG_PASSWORD	1	/* new more secure passwords */
 #define CLIENT_FOUND_ROWS	2	/* Found instead of affected rows */
 
=== modified file 'Percona-Server/include/violite.h'
--- Percona-Server/include/violite.h	2013-03-05 12:46:43 +0000
+++ Percona-Server/include/violite.h	2013-05-20 14:30:50 +0000
@@ -252,7 +252,7 @@
   my_bool (*was_timeout)(Vio*);
   int     (*vioclose)(Vio*);
   my_bool (*is_connected)(Vio*);
-  int (*shutdown)(Vio *, int);
+  int     (*shutdown)(Vio *, int);
   my_bool (*has_data) (Vio*);
   int (*io_wait)(Vio*, enum enum_vio_io_event, int);
   my_bool (*connect)(Vio*, struct sockaddr *, socklen_t, int);
 
=== added directory 'Percona-Server/internal'
=== added directory 'Percona-Server/internal/mysql-test'
=== added directory 'Percona-Server/internal/mysql-test/suite'
=== added directory 'Percona-Server/internal/mysql-test/suite/i_innodb'
=== added directory 'Percona-Server/internal/mysql-test/suite/i_innodb/r'
=== added file 'Percona-Server/internal/mysql-test/suite/i_innodb/r/dummy.result'
--- Percona-Server/internal/mysql-test/suite/i_innodb/r/dummy.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/internal/mysql-test/suite/i_innodb/r/dummy.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,1 @@
+Dummy innodb test
 
=== added directory 'Percona-Server/internal/mysql-test/suite/i_innodb/t'
=== added file 'Percona-Server/internal/mysql-test/suite/i_innodb/t/dummy.test'
--- Percona-Server/internal/mysql-test/suite/i_innodb/t/dummy.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/internal/mysql-test/suite/i_innodb/t/dummy.test	2013-05-20 14:30:50 +0000
@@ -0,0 +1,3 @@
+# This is a dummy test for innodb, feel free to rename and reuse for real test
+--source include/have_innodb.inc
+--echo Dummy innodb test
 
=== added directory 'Percona-Server/internal/mysql-test/suite/i_main'
=== added directory 'Percona-Server/internal/mysql-test/suite/i_main/r'
=== added file 'Percona-Server/internal/mysql-test/suite/i_main/r/dummy.result'
--- Percona-Server/internal/mysql-test/suite/i_main/r/dummy.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/internal/mysql-test/suite/i_main/r/dummy.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,1 @@
+This is a dummy
 
=== added file 'Percona-Server/internal/mysql-test/suite/i_main/r/update.result'
--- Percona-Server/internal/mysql-test/suite/i_main/r/update.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/internal/mysql-test/suite/i_main/r/update.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,17 @@
+#
+# 65745: UPDATE ON INNODB TABLE ENTERS RECURSION
+#
+CREATE TABLE t1 (
+id1 int NOT NULL,
+id2 int NOT NULL,
+a int,
+b int,
+PRIMARY KEY (id1,id2),
+KEY (id1, a)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+INSERT INTO `t1` VALUES (1,1,NULL,1);
+INSERT INTO `t1` VALUES (2,2,1,NULL);
+INSERT INTO `t1` VALUES (2,6,NULL,2);
+UPDATE t1 SET id2 = id2 + 1, b = null WHERE a is null and id1 = 2;
+DROP TABLE t1;
+#
 
=== added directory 'Percona-Server/internal/mysql-test/suite/i_main/t'
=== added file 'Percona-Server/internal/mysql-test/suite/i_main/t/dummy.test'
--- Percona-Server/internal/mysql-test/suite/i_main/t/dummy.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/internal/mysql-test/suite/i_main/t/dummy.test	2013-05-20 14:30:50 +0000
@@ -0,0 +1,2 @@
+# Dummy test testing testing of internal
+echo This is a dummy;
 
=== added file 'Percona-Server/internal/mysql-test/suite/i_main/t/update.test'
--- Percona-Server/internal/mysql-test/suite/i_main/t/update.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/internal/mysql-test/suite/i_main/t/update.test	2013-05-20 14:30:50 +0000
@@ -0,0 +1,21 @@
+--echo #
+--echo # 65745: UPDATE ON INNODB TABLE ENTERS RECURSION
+--echo #
+CREATE TABLE t1 (
+ id1 int NOT NULL,
+ id2 int NOT NULL,
+ a int,
+ b int,
+ PRIMARY KEY (id1,id2),
+ KEY (id1, a)
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO `t1` VALUES (1,1,NULL,1);
+INSERT INTO `t1` VALUES (2,2,1,NULL);
+INSERT INTO `t1` VALUES (2,6,NULL,2);
+# should not hang
+UPDATE t1 SET id2 = id2 + 1, b = null WHERE a is null and id1 = 2;
+
+DROP TABLE t1;
+--echo #
+
 
=== added file 'Percona-Server/man/mysqld.8'
--- Percona-Server/man/mysqld.8	1970-01-01 00:00:00 +0000
+++ Percona-Server/man/mysqld.8	2013-05-20 14:30:50 +0000
@@ -0,0 +1,69 @@
+'\" t
+.\"     Title: \fBmysqld\fR
+.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 03/02/2012
+.\"    Manual: MySQL Database System
+.\"    Source: MySQL 5.5
+.\"  Language: English
+.\"
+.TH "\FBMYSQLD\FR" "8" "03/02/2012" "MySQL 5\&.5" "MySQL Database System"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.\" mysqld: MySQL server
+.\" MySQL server: mysqld
+.SH "NAME"
+mysqld \- the MySQL server
+.SH "SYNOPSIS"
+.HP \w'\fBmysqld\ [\fR\fB\fIoptions\fR\fR\fB]\fR\ 'u
+\fBmysqld [\fR\fB\fIoptions\fR\fR\fB]\fR
+.SH "DESCRIPTION"
+.PP
+\fBmysqld\fR, also known as MySQL Server, is the main program that does most of the work in a MySQL installation\&. MySQL Server manages access to the MySQL data directory that contains databases and tables\&. The data directory is also the default location for other information such as log files and status files\&.
+.PP
+When MySQL server starts, it listens for network connections from client programs and manages access to databases on behalf of those clients\&.
+.PP
+The
+\fBmysqld\fR
+program has many options that can be specified at startup\&. For a complete list of options, run this command:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+shell> \fBmysqld \-\-verbose \-\-help\fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+MySQL Server also has a set of system variables that affect its operation as it runs\&. System variables can be set at server startup, and many of them can be changed at runtime to effect dynamic server reconfiguration\&. MySQL Server also has a set of status variables that provide information about its operation\&. You can monitor these status variables to access runtime performance characteristics\&.
+.PP
+For a full description of MySQL Server command options, system variables, and status variables, see
+Section\ \&5.1, \(lqThe MySQL Server\(rq\&. For information about installing MySQL and setting up the initial configuration, see
+Chapter\ \&2, Installing and Upgrading MySQL\&.
+.SH "COPYRIGHT"
+.br
+.PP
+Copyright \(co 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+.PP
+This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
+.PP
+This documentation 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.
+.PP
+You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
+.sp
+.SH "SEE ALSO"
+For more information, please refer to the MySQL Reference Manual,
+which may already be installed locally and which is also available
+online at http://dev.mysql.com/doc/.
+.SH AUTHOR
+Oracle Corporation (http://dev.mysql.com/).
 
=== added file 'Percona-Server/mysql-test/include/have_64_keys.inc'
--- Percona-Server/mysql-test/include/have_64_keys.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/have_64_keys.inc	2013-05-20 14:30:50 +0000
@@ -0,0 +1,12 @@
+# Check that we have MAX_INDEXES=64
+
+--require r/have_64_keys.require
+
+# Check that maximum length of possible_keys and key_len fields is 4096
+# They are defined in THD::send_explain_fields as NAME_CHAR_LEN*MAX_KEY
+# where NAME_CHAR_LEN is always 64 (mysql_com.h) and MAX_KEY is
+# a synonym of MAX_INDEXES
+
+--enable_metadata
+EXPLAIN SELECT 1;
+--disable_metadata
 
=== added file 'Percona-Server/mysql-test/include/log_cleanup.inc'
--- Percona-Server/mysql-test/include/log_cleanup.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/log_cleanup.inc	2013-05-20 14:30:50 +0000
@@ -0,0 +1,1 @@
+--remove_files_wildcard $MYSQLTEST_VARDIR *.slog
 
=== added file 'Percona-Server/mysql-test/include/log_grep.inc'
--- Percona-Server/mysql-test/include/log_grep.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/log_grep.inc	2013-05-20 14:30:50 +0000
@@ -0,0 +1,41 @@
+--echo [log_grep.inc] file: $log_file pattern: $grep_pattern
+perl;
+  $log_file=           $ENV{'log_file'};
+  $log_file_full_path= $ENV{'log_file_full_path'};
+  $log_slow_rate_test= $ENV{'log_slow_rate_test'};
+  open(FILE, "$log_file_full_path") 
+    or die("Cannot open file $log_file_full_path: $!\n");
+
+  if ($log_slow_rate_test) {
+    $one= 0;
+    $two= 0;
+    $three= 0;
+    while(<FILE>) {
+      $one++   if(/'connection_one'/);
+      $two++   if(/'connection_two'/);
+      $three++ if(/'connection_three'/);
+    }
+    $sum= $one + $two + $three;
+    $zero= 0;
+    if ($one == 0) {
+      $zero++;
+    }
+    if ($two == 0) {
+      $zero++;
+    }
+    if ($three == 0) {
+      $zero++;
+    }
+    print "[log_grep.inc] sum:  $sum\n";
+    print "[log_grep.inc] zero: $zero\n";
+  }
+  else {
+    $grep_pattern=       $ENV{'grep_pattern'};
+    $lines= 0;
+    while(<FILE>) {
+      $lines++ if (/$grep_pattern/);
+    }
+    print "[log_grep.inc] lines:   $lines\n";
+  }
+  close(FILE);
+EOF
 
=== added file 'Percona-Server/mysql-test/include/log_start.inc'
--- Percona-Server/mysql-test/include/log_start.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/log_start.inc	2013-05-20 14:30:50 +0000
@@ -0,0 +1,11 @@
+--let slow_query_log_file_old=`SELECT Variable_value FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE Variable_name = 'slow_query_log_file';`
+--let slow_query_log_old=`SELECT Variable_value FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE Variable_name = 'slow_query_log';`
+--let log_output_old=`SELECT Variable_value FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE Variable_name = 'log_output';`
+--disable_query_log
+--let log_file_full_path = $MYSQLTEST_VARDIR/$log_file.slog
+SET GLOBAL slow_query_log=0;
+SET GLOBAL log_output=FILE;
+--echo [log_start.inc] $log_file
+EVAL SET GLOBAL slow_query_log_file="$log_file_full_path";
+SET GLOBAL slow_query_log=1;
+--enable_query_log
 
=== added file 'Percona-Server/mysql-test/include/log_stop.inc'
--- Percona-Server/mysql-test/include/log_stop.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/log_stop.inc	2013-05-20 14:30:50 +0000
@@ -0,0 +1,7 @@
+--disable_query_log
+SET GLOBAL slow_query_log=0;
+--echo [log_stop.inc] $log_file
+EVAL SET GLOBAL log_output= $log_output_old;
+EVAL SET GLOBAL slow_query_log_file= "$slow_query_log_file_old";
+EVAL SET GLOBAL slow_query_log=      $slow_query_log_old;
+--enable_query_log
 
=== added file 'Percona-Server/mysql-test/include/percona_processlist_row_stats_show.inc'
--- Percona-Server/mysql-test/include/percona_processlist_row_stats_show.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_processlist_row_stats_show.inc	2013-05-20 14:30:50 +0000
@@ -0,0 +1,7 @@
+--replace_column 1 ### 3 ### 6 ### 7 ###
+SHOW PROCESSLIST;
+
+--replace_column 1 ###
+SELECT id, info, rows_sent, rows_examined FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id;
+
+SET DEBUG_SYNC= 'now SIGNAL threads_dumped';
 
=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc	2013-05-20 14:30:50 +0000
@@ -0,0 +1,95 @@
+--source include/percona_query_cache_with_comments_clear.inc
+let $query=/* with comment first */select * from t1;
+eval $query;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=# with comment first
+select * from t1;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=-- with comment first
+select * from t1;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=/* with comment first and "quote" */select * from t1;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=# with comment first and "quote"
+select * from t1;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=-- with comment first and "quote" 
+select * from t1;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=
+    /* with comment and whitespaces first */select * from t1;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query= 
+    # with comment and whitespaces first
+select * from t1;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=
+    -- with comment and whitespaces first
+select * from t1;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $internal=* internal comment *;
+
+let $query=select * /$internal/ from t1;
+--source include/percona_query_cache_with_comments_eval.inc
+let $query=select */$internal/ from t1;
+--source include/percona_query_cache_with_comments_eval.inc
+let $query=select */$internal/from t1;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $internal=* internal comment with "quote" *;
+
+let $query=select * /$internal/ from t1;
+--source include/percona_query_cache_with_comments_eval.inc
+let $query=select */$internal/ from t1;
+--source include/percona_query_cache_with_comments_eval.inc
+let $query=select */$internal/from t1;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=select * from t1
+;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=select * from t1 ;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=select * from t1	;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=select * from t1
+/* comment in the end */;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=select * from t1
+/* *\/ */;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=select * from t1
+/* comment in the end */
+;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=select * from t1 #comment in the end;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=select * from t1 #comment in the end
+;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=select * from t1 -- comment in the end;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=select * from t1 -- comment in the end
+;
+--source include/percona_query_cache_with_comments_eval.inc
+
+let $query=select ' \'  ' from t1;
+--source include/percona_query_cache_with_comments_eval.inc
 
=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc	2013-05-20 14:30:50 +0000
@@ -0,0 +1,12 @@
+-- source include/have_query_cache.inc
+
+set GLOBAL query_cache_size=1355776;
+
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+create table t1 (a int not null);
+insert into t1 values (1),(2),(3);
+
+--source include/percona_query_cache_with_comments_clear.inc
 
=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc	2013-05-20 14:30:50 +0000
@@ -0,0 +1,5 @@
+# Reset query cache variables.
+flush query cache; # This crashed in some versions
+flush query cache; # This crashed in some versions
+reset query cache;
+flush status;
 
=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc	2013-05-20 14:30:50 +0000
@@ -0,0 +1,3 @@
+DROP TABLE t1;
+SET GLOBAL query_cache_size=default;
+set global query_cache_strip_comments=OFF;
 
=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc	2013-05-20 14:30:50 +0000
@@ -0,0 +1,7 @@
+echo -----------------------------------------------------;
+echo $query;
+echo -----------------------------------------------------;
+--source include/percona_query_cache_with_comments_show.inc
+eval $query;
+eval $query;
+--source include/percona_query_cache_with_comments_show.inc
 
=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc	2013-05-20 14:30:50 +0000
@@ -0,0 +1,8 @@
+let $show=show status like "Qcache_queries_in_cache";
+eval $show;
+let $show=show status like "Qcache_inserts";
+eval $show;
+let $show=show status like "Qcache_hits";
+eval $show;
+
+
 
=== added file 'Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc'
--- Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc	2013-05-20 14:30:50 +0000
@@ -0,0 +1,56 @@
+--echo
+--disable_result_log
+connection slave_lock;
+--echo [slave_lock]
+send SHOW SLAVE STATUS;
+
+connection slave;
+--let $condition= 'SHOW SLAVE STATUS'
+--source include/wait_show_condition.inc
+
+--disable_warnings
+SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1';
+--enable_warnings
+
+--let current=`SELECT SUBSTR(Variable_value FROM 22) FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE Variable_name = 'DEBUG_SYNC'`
+--echo SIGNAL after SHOW SLAVE STATUS is $current
+
+connection slave;
+--echo [slave]
+SET DEBUG_SYNC='now SIGNAL signal.empty';
+
+connection slave_nolock;
+--echo [slave_nolock]
+send SHOW SLAVE STATUS NOLOCK;
+
+connection slave;
+--let $condition= 'SHOW SLAVE STATUS NOLOCK'
+--source include/wait_show_condition.inc
+
+--disable_warnings
+SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1';
+--enable_warnings
+
+--echo # should be 'signal.after_show_slave_status'
+--let current=`SELECT SUBSTR(Variable_value FROM 22) FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE Variable_name = 'DEBUG_SYNC'`
+--echo SIGNAL after SHOW SLAVE STATUS NOLOCK is $current
+
+connection slave;
+--echo [slave]
+SET DEBUG_SYNC='now SIGNAL signal.continue';
+
+connection slave_lock;
+--disable_result_log
+reap;
+--enable_result_log
+
+connection slave_nolock;
+--disable_result_log
+reap;
+--enable_result_log
+
+connection slave;
+--echo [slave]
+SET DEBUG_SYNC='now SIGNAL signal.empty';
+--enable_result_log
+--echo
 
=== added file 'Percona-Server/mysql-test/include/percona_slow_log_verbosity_grep.inc'
--- Percona-Server/mysql-test/include/percona_slow_log_verbosity_grep.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_slow_log_verbosity_grep.inc	2013-05-20 14:30:50 +0000
@@ -0,0 +1,26 @@
+# Common extensions to the slow query log
+--let grep_pattern = ^# Schema: .+  Last_errno: \d+  Killed: \d+\$
+--source include/log_grep.inc
+--let grep_pattern = ^#.*Rows_affected: \d+  Rows_read: \d+\$
+--source include/log_grep.inc
+--let grep_pattern = ^# Bytes_sent: \d+.*\$
+--source include/log_grep.inc
+# InnoDB
+--let grep_pattern = ^# InnoDB_trx_id: \w+\$
+--source include/log_grep.inc
+# Query plan
+--let grep_pattern = ^# Bytes_sent: \d+  Tmp_tables: \d+  Tmp_disk_tables: \d+  Tmp_table_sizes: \d+\$
+--source include/log_grep.inc
+--let grep_pattern = ^# QC_Hit: (Yes|No)  Full_scan: (Yes|No)  Full_join: (Yes|No)  Tmp_table: (Yes|No)  Tmp_table_on_disk: (Yes|No)\$
+--source include/log_grep.inc
+--let grep_pattern = ^# Filesort: (Yes|No)  Filesort_on_disk: (Yes|No)  Merge_passes: \d+\$
+--source include/log_grep.inc
+# InnoDB
+--let grep_pattern = ^#   InnoDB_IO_r_ops: \d+  InnoDB_IO_r_bytes: \d+  InnoDB_IO_r_wait: \d*\.\d*\$
+--source include/log_grep.inc
+--let grep_pattern = ^#   InnoDB_rec_lock_wait: \d*\.\d*  InnoDB_queue_wait: \d*\.\d*\$
+--source include/log_grep.inc
+--let grep_pattern = ^#   InnoDB_pages_distinct: \d+\$
+--source include/log_grep.inc
+--let grep_pattern = ^# No InnoDB statistics available for this query\$
+--source include/log_grep.inc
 
=== added file 'Percona-Server/mysql-test/include/percona_slow_query_log_rate.inc'
--- Percona-Server/mysql-test/include/percona_slow_query_log_rate.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_slow_query_log_rate.inc	2013-05-20 14:30:50 +0000
@@ -0,0 +1,37 @@
+--connection default
+
+--source include/count_sessions.inc
+--connect (connection_one,localhost,root,,)
+--connect (connection_two,localhost,root,,)
+--connect (connection_three,localhost,root,,)
+
+--source include/log_start.inc
+
+--let i=2
+--let k=1
+
+while($i)
+{
+--connection connection_one
+inc $k;
+SELECT 'connection_one';
+
+--connection connection_two
+inc $k;
+SELECT 'connection_two';
+
+--connection connection_three
+inc $k;
+SELECT 'connection_three';
+
+dec $i;
+}
+
+--connection default
+--source include/log_stop.inc
+--disconnect connection_one
+--disconnect connection_two
+--disconnect connection_three
+--source include/wait_until_count_sessions.inc
+--let log_slow_rate_test=1
+--source include/log_grep.inc
 
=== modified file 'Percona-Server/mysql-test/r/connect.result'
--- Percona-Server/mysql-test/r/connect.result	2013-03-05 12:46:43 +0000
+++ Percona-Server/mysql-test/r/connect.result	2013-05-20 14:30:50 +0000
@@ -1,3 +1,4 @@
+set global log_warnings=0;
 drop table if exists t1,t2;
 show tables;
 Tables_in_mysql
@@ -411,3 +412,4 @@
 # ------------------------------------------------------------------
 # -- End of 5.6 tests
 # ------------------------------------------------------------------
+set global log_warnings=1;
 
=== modified file 'Percona-Server/mysql-test/r/create.result'
--- Percona-Server/mysql-test/r/create.result	2013-03-05 12:46:43 +0000
+++ Percona-Server/mysql-test/r/create.result	2013-05-20 14:30:50 +0000
@@ -33,10 +33,7 @@
 create table t1 (b char(0) not null, index(b));
 ERROR 42000: The used storage engine can't index column 'b'
 create table t1 (a int not null,b text) engine=heap;
-ERROR 42000: The used table type doesn't support BLOB/TEXT columns
 drop table if exists t1;
-Warnings:
-Note	1051	Unknown table 'test.t1'
 create table t1 (ordid int(8) not null auto_increment, ord  varchar(50) not null, primary key (ord,ordid)) engine=heap;
 ERROR 42000: Incorrect table definition; there can be only one auto column and it must be defined as a key
 create table not_existing_database.test (a int);
@@ -1897,7 +1894,9 @@
   `TIME` int(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
   `INFO` longtext,
-  `TIME_MS` bigint(21) NOT NULL DEFAULT '0'
+  `TIME_MS` bigint(21) NOT NULL DEFAULT '0',
+  `ROWS_SENT` bigint(21) unsigned NOT NULL DEFAULT '0',
+  `ROWS_EXAMINED` bigint(21) unsigned NOT NULL DEFAULT '0'
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 drop table t1;
 create temporary table t1 like information_schema.processlist;
@@ -1912,7 +1911,9 @@
   `TIME` int(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
   `INFO` longtext,
-  `TIME_MS` bigint(21) NOT NULL DEFAULT '0'
+  `TIME_MS` bigint(21) NOT NULL DEFAULT '0',
+  `ROWS_SENT` bigint(21) unsigned NOT NULL DEFAULT '0',
+  `ROWS_EXAMINED` bigint(21) unsigned NOT NULL DEFAULT '0'
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 drop table t1;
 create table t1 like information_schema.character_sets;
 
=== modified file 'Percona-Server/mysql-test/r/ctype_utf8mb4_heap.result'
--- Percona-Server/mysql-test/r/ctype_utf8mb4_heap.result	2013-03-05 12:46:43 +0000
+++ Percona-Server/mysql-test/r/ctype_utf8mb4_heap.result	2013-05-20 14:30:50 +0000
@@ -1180,6 +1180,8 @@
 a varchar(255) NOT NULL default '',
 KEY a (a)
 ) ENGINE=heap DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci;
+Warnings:
+Warning	1071	Specified key was too long; max key length is 1000 bytes
 insert into t1 values (_utf8mb4 0xe880bd);
 insert into t1 values (_utf8mb4 0x5b);
 select hex(a) from t1;
@@ -1218,6 +1220,8 @@
 Warnings:
 Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1(a VARCHAR(255), KEY(a)) ENGINE=heap DEFAULT CHARSET=utf8mb4;
+Warnings:
+Warning	1071	Specified key was too long; max key length is 1000 bytes
 INSERT INTO t1 VALUES('uuABCDEFGHIGKLMNOPRSTUVWXYZ̈bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
 INSERT INTO t1 VALUES('uu');
 check table t1;
 
=== modified file 'Percona-Server/mysql-test/r/derived.result'
--- Percona-Server/mysql-test/r/derived.result	2013-02-12 07:47:19 +0000
+++ Percona-Server/mysql-test/r/derived.result	2013-05-20 14:30:50 +0000
@@ -1530,7 +1530,7 @@
 heap to myisam.
 show status like 'Handler_write';
 Variable_name	Value
-Handler_write	1021
+Handler_write	1011
 set @@max_heap_table_size= @save_heap_size;
 drop table t1;
 #
 
=== modified file 'Percona-Server/mysql-test/r/disabled_replication.result'
--- Percona-Server/mysql-test/r/disabled_replication.result	2012-12-14 15:02:07 +0000
+++ Percona-Server/mysql-test/r/disabled_replication.result	2013-05-20 14:30:50 +0000
@@ -1,5 +1,6 @@
 SHOW SLAVE STATUS;
-Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Master_UUID	Master_Info_File	SQL_Delay	SQL_Remaining_Delay	Slave_SQL_Running_State	Master_Retry_Count	Master_Bind	Last_IO_Error_Timestamp	Last_SQL_Error_Timestamp	Master_SSL_Crl	Master_SSL_Crlpath	Retrieved_Gtid_Set	Executed_Gtid_Set	Auto_Position
+Warnings:
+Warning	1617	The master info structure does not exist
 RESET SLAVE;
 ERROR HY000: Slave is not configured or failed to initialize properly. You must at least set --server-id to enable either a master or a slave. Additional error messages can be found in the MySQL error log.
 SHOW RELAYLOG EVENTS;
 
=== added file 'Percona-Server/mysql-test/r/group_commit_crash.result'
--- Percona-Server/mysql-test/r/group_commit_crash.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/group_commit_crash.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,101 @@
+call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.');
+CREATE TABLE t1(a CHAR(255),
+b CHAR(255),
+c CHAR(255),
+d CHAR(255),
+id INT AUTO_INCREMENT,
+PRIMARY KEY(id)) ENGINE=InnoDB;
+create table t2 like t1;
+create procedure setcrash(IN i INT)
+begin
+CASE i
+WHEN 1 THEN SET SESSION debug="d,crash_commit_after_prepare";
+WHEN 2 THEN SET SESSION debug="d,crash_commit_after_prepare";
+WHEN 3 THEN SET SESSION debug="d,crash_commit_after_prepare";
+WHEN 4 THEN SET SESSION debug="d,crash_commit_after_prepare";
+#    WHEN 2 THEN SET SESSION debug="d,crash_commit_after_log";
+#    WHEN 3 THEN SET SESSION debug="d,crash_before_writing_xid";
+#    WHEN 4 THEN SET SESSION debug="d,crash_commit_after";
+WHEN 5 THEN SET SESSION debug="d,crash_commit_before";
+ELSE BEGIN END;
+END CASE;
+end //
+FLUSH TABLES;
+INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd');
+INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd');
+INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd');
+INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd');
+INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd');
+INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd');
+INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd');
+INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd');
+INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd');
+INSERT INTO t2(a, b, c, d) VALUES ('a', 'b', 'c', 'd');
+RESET MASTER;
+START TRANSACTION;
+insert into t1 select * from t2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave.
+call setcrash(5);
+COMMIT;
+Got one of the listed errors
+SELECT * FROM t1 ORDER BY id;
+a	b	c	d	id
+SHOW BINLOG EVENTS LIMIT 2,1;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+delete from t1;
+RESET MASTER;
+START TRANSACTION;
+insert into t1 select * from t2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave.
+call setcrash(4);
+COMMIT;
+Got one of the listed errors
+SELECT * FROM t1 ORDER BY id;
+a	b	c	d	id
+SHOW BINLOG EVENTS LIMIT 2,1;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+delete from t1;
+RESET MASTER;
+START TRANSACTION;
+insert into t1 select * from t2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave.
+call setcrash(3);
+COMMIT;
+Got one of the listed errors
+SELECT * FROM t1 ORDER BY id;
+a	b	c	d	id
+SHOW BINLOG EVENTS LIMIT 2,1;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+delete from t1;
+RESET MASTER;
+START TRANSACTION;
+insert into t1 select * from t2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave.
+call setcrash(2);
+COMMIT;
+Got one of the listed errors
+SELECT * FROM t1 ORDER BY id;
+a	b	c	d	id
+SHOW BINLOG EVENTS LIMIT 2,1;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+delete from t1;
+RESET MASTER;
+START TRANSACTION;
+insert into t1 select * from t2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave.
+call setcrash(1);
+COMMIT;
+Got one of the listed errors
+SELECT * FROM t1 ORDER BY id;
+a	b	c	d	id
+SHOW BINLOG EVENTS LIMIT 2,1;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+delete from t1;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE setcrash;
 
=== added file 'Percona-Server/mysql-test/r/have_64_keys.require'
--- Percona-Server/mysql-test/r/have_64_keys.require	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/have_64_keys.require	2013-05-20 14:30:50 +0000
@@ -0,0 +1,14 @@
+EXPLAIN SELECT 1;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					id	8	3	1	N	32929	0	63
+def					select_type	253	19	6	N	1	31	8
+def					table	253	64	0	Y	0	31	8
+def					type	253	10	0	Y	0	31	8
+def					possible_keys	253	4096	0	Y	0	31	8
+def					key	253	64	0	Y	0	31	8
+def					key_len	253	4096	0	Y	0	31	8
+def					ref	253	1024	0	Y	0	31	8
+def					rows	8	10	0	Y	32928	0	63
+def					Extra	253	255	14	N	1	31	8
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 
=== modified file 'Percona-Server/mysql-test/r/information_schema.result'
--- Percona-Server/mysql-test/r/information_schema.result	2013-03-05 12:46:43 +0000
+++ Percona-Server/mysql-test/r/information_schema.result	2013-05-20 14:30:50 +0000
@@ -54,10 +54,12 @@
 select * from v1;
 c
 CHARACTER_SETS
+CLIENT_STATISTICS
 COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+INDEX_STATISTICS
 ENGINES
 EVENTS
 FILES
@@ -82,9 +84,12 @@
 TABLESPACES
 TABLE_CONSTRAINTS
 TABLE_PRIVILEGES
+TABLE_STATISTICS
 TEMPORARY_TABLES
+THREAD_STATISTICS
 TRIGGERS
 USER_PRIVILEGES
+USER_STATISTICS
 VIEWS
 XTRADB_INTERNAL_HASH_TABLES
 XTRADB_RSEG
@@ -128,7 +133,9 @@
 TABLESPACES	TABLESPACES
 TABLE_CONSTRAINTS	TABLE_CONSTRAINTS
 TABLE_PRIVILEGES	TABLE_PRIVILEGES
+TABLE_STATISTICS	TABLE_STATISTICS
 TEMPORARY_TABLES	TEMPORARY_TABLES
+THREAD_STATISTICS	THREAD_STATISTICS
 TRIGGERS	TRIGGERS
 tables_priv	tables_priv
 time_zone	time_zone
@@ -149,7 +156,9 @@
 TABLESPACES	TABLESPACES
 TABLE_CONSTRAINTS	TABLE_CONSTRAINTS
 TABLE_PRIVILEGES	TABLE_PRIVILEGES
+TABLE_STATISTICS	TABLE_STATISTICS
 TEMPORARY_TABLES	TEMPORARY_TABLES
+THREAD_STATISTICS	THREAD_STATISTICS
 TRIGGERS	TRIGGERS
 tables_priv	tables_priv
 time_zone	time_zone
@@ -170,7 +179,9 @@
 TABLESPACES	TABLESPACES
 TABLE_CONSTRAINTS	TABLE_CONSTRAINTS
 TABLE_PRIVILEGES	TABLE_PRIVILEGES
+TABLE_STATISTICS	TABLE_STATISTICS
 TEMPORARY_TABLES	TEMPORARY_TABLES
+THREAD_STATISTICS	THREAD_STATISTICS
 TRIGGERS	TRIGGERS
 tables_priv	tables_priv
 time_zone	time_zone
@@ -657,14 +668,16 @@
 where table_schema='information_schema' limit 2;
 TABLE_NAME	TABLE_TYPE	ENGINE
 CHARACTER_SETS	SYSTEM VIEW	MEMORY
-COLLATIONS	SYSTEM VIEW	MEMORY
+CLIENT_STATISTICS	SYSTEM VIEW	MEMORY
 show tables from information_schema like "T%";
 Tables_in_information_schema (T%)
 TABLES
 TABLESPACES
 TABLE_CONSTRAINTS
 TABLE_PRIVILEGES
+TABLE_STATISTICS
 TEMPORARY_TABLES
+THREAD_STATISTICS
 TRIGGERS
 create database information_schema;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
@@ -675,7 +688,9 @@
 TABLESPACES	SYSTEM VIEW
 TABLE_CONSTRAINTS	SYSTEM VIEW
 TABLE_PRIVILEGES	SYSTEM VIEW
+TABLE_STATISTICS	SYSTEM VIEW
 TEMPORARY_TABLES	SYSTEM VIEW
+THREAD_STATISTICS	SYSTEM VIEW
 TRIGGERS	SYSTEM VIEW
 create table t1(a int);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
@@ -689,7 +704,9 @@
 TABLESPACES
 TABLE_CONSTRAINTS
 TABLE_PRIVILEGES
+TABLE_STATISTICS
 TEMPORARY_TABLES
+THREAD_STATISTICS
 TRIGGERS
 select table_name from tables where table_name='user';
 table_name
@@ -891,6 +908,7 @@
 COLUMN_PRIVILEGES	TABLE_NAME	select
 FILES	TABLE_NAME	select
 GLOBAL_TEMPORARY_TABLES	TABLE_NAME	select
+INDEX_STATISTICS	TABLE_NAME	select
 INNODB_BUFFER_PAGE	TABLE_NAME	select
 INNODB_BUFFER_PAGE_LRU	TABLE_NAME	select
 INNODB_CMP_PER_INDEX	table_name	select
@@ -902,6 +920,7 @@
 TABLES	TABLE_NAME	select
 TABLE_CONSTRAINTS	TABLE_NAME	select
 TABLE_PRIVILEGES	TABLE_NAME	select
+TABLE_STATISTICS	TABLE_NAME	select
 TEMPORARY_TABLES	TABLE_NAME	select
 VIEWS	TABLE_NAME	select
 delete from mysql.user where user='mysqltest_4';
@@ -912,7 +931,7 @@
 AND table_name not like 'ndb%' AND table_name not like 'innodb_%'
 GROUP BY TABLE_SCHEMA;
 table_schema	count(*)
-information_schema	36
+information_schema	41
 mysql	25
 create table t1 (i int, j int);
 create trigger trg1 before insert on t1 for each row
@@ -1353,6 +1372,7 @@
 group by t.table_name order by num1, t.table_name;
 table_name	group_concat(t.table_schema, '.', t.table_name)	num1
 CHARACTER_SETS	information_schema.CHARACTER_SETS	1
+CLIENT_STATISTICS	information_schema.CLIENT_STATISTICS	1
 COLLATIONS	information_schema.COLLATIONS	1
 COLLATION_CHARACTER_SET_APPLICABILITY	information_schema.COLLATION_CHARACTER_SET_APPLICABILITY	1
 COLUMNS	information_schema.COLUMNS	1
@@ -1363,6 +1383,7 @@
 GLOBAL_STATUS	information_schema.GLOBAL_STATUS	1
 GLOBAL_TEMPORARY_TABLES	information_schema.GLOBAL_TEMPORARY_TABLES	1
 GLOBAL_VARIABLES	information_schema.GLOBAL_VARIABLES	1
+INDEX_STATISTICS	information_schema.INDEX_STATISTICS	1
 KEY_COLUMN_USAGE	information_schema.KEY_COLUMN_USAGE	1
 OPTIMIZER_TRACE	information_schema.OPTIMIZER_TRACE	1
 PARAMETERS	information_schema.PARAMETERS	1
@@ -1381,9 +1402,12 @@
 TABLESPACES	information_schema.TABLESPACES	1
 TABLE_CONSTRAINTS	information_schema.TABLE_CONSTRAINTS	1
 TABLE_PRIVILEGES	information_schema.TABLE_PRIVILEGES	1
+TABLE_STATISTICS	information_schema.TABLE_STATISTICS	1
 TEMPORARY_TABLES	information_schema.TEMPORARY_TABLES	1
+THREAD_STATISTICS	information_schema.THREAD_STATISTICS	1
 TRIGGERS	information_schema.TRIGGERS	1
 USER_PRIVILEGES	information_schema.USER_PRIVILEGES	1
+USER_STATISTICS	information_schema.USER_STATISTICS	1
 VIEWS	information_schema.VIEWS	1
 XTRADB_INTERNAL_HASH_TABLES	information_schema.XTRADB_INTERNAL_HASH_TABLES	1
 XTRADB_READ_VIEW	information_schema.XTRADB_READ_VIEW	1
@@ -1758,6 +1782,10 @@
 length(CAST(b AS CHAR))
 20
 DROP TABLE ubig;
+grant usage on *.* to mysqltest_1@localhost;
+select 1 from information_schema.tables where table_schema=repeat('a', 2000);
+1
+drop user mysqltest_1@localhost;
 End of 5.1 tests.
 create function f1 (p1 int, p2 datetime, p3 decimal(10,2))
 returns char(10) return null;
 
=== modified file 'Percona-Server/mysql-test/r/information_schema_db.result'
--- Percona-Server/mysql-test/r/information_schema_db.result	2013-03-05 12:46:43 +0000
+++ Percona-Server/mysql-test/r/information_schema_db.result	2013-05-20 14:30:50 +0000
@@ -6,10 +6,12 @@
 show tables where Tables_in_information_schema NOT LIKE 'Innodb%';
 Tables_in_information_schema
 CHARACTER_SETS
+CLIENT_STATISTICS
 COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+INDEX_STATISTICS
 ENGINES
 EVENTS
 FILES
@@ -34,9 +36,12 @@
 TABLESPACES
 TABLE_CONSTRAINTS
 TABLE_PRIVILEGES
+TABLE_STATISTICS
 TEMPORARY_TABLES
+THREAD_STATISTICS
 TRIGGERS
 USER_PRIVILEGES
+USER_STATISTICS
 VIEWS
 XTRADB_INTERNAL_HASH_TABLES
 XTRADB_RSEG
@@ -47,7 +52,9 @@
 TABLESPACES
 TABLE_CONSTRAINTS
 TABLE_PRIVILEGES
+TABLE_STATISTICS
 TEMPORARY_TABLES
+THREAD_STATISTICS
 TRIGGERS
 create database `inf%`;
 create database mbase;
 
=== modified file 'Percona-Server/mysql-test/r/mysqld--help-notwin.result'
--- Percona-Server/mysql-test/r/mysqld--help-notwin.result	2013-03-21 06:31:46 +0000
+++ Percona-Server/mysql-test/r/mysqld--help-notwin.result	2013-05-20 14:30:50 +0000
@@ -186,6 +186,8 @@
  disallowed statements include CREATE TEMPORARY TABLE
  inside transactions, all updates to non-transactional
  tables, and CREATE TABLE ... SELECT.
+ --enforce-storage-engine=name 
+ Force the use of a storage engine for new tables
  --eq-range-index-dive-limit=# 
  The optimizer will use existing index statistics instead
  of doing index dives for equality ranges if the number of
@@ -332,9 +334,32 @@
  --log-slow-admin-statements 
  Log slow OPTIMIZE, ANALYZE, ALTER and other
  administrative statements to the slow log if it is open.
+ --log-slow-filter=name 
+ Log only the queries that followed certain execution
+ plan. Multiple flags allowed in a comma-separated string.
+ [qc_miss, full_scan, full_join, tmp_table,
+ tmp_table_on_disk, filesort, filesort_on_disk]
+ --log-slow-rate-limit=# 
+ Rate limit statement writes to slow log to only those
+ from every (1/log_slow_rate_limit) session.
+ --log-slow-rate-type=name 
+ Choose the log_slow_rate_limit behavior: session or
+ query. When you choose 'session' - every
+ %log_slow_rate_limit connection will be processed to slow
+ query log. When you choose 'query' - every
+ %log_slow_rate_limit query will be processed to slow
+ query log. [session, query]
  --log-slow-slave-statements 
- Log slow statements executed by slave thread to the slow
- log if it is open.
+ Log queries replayed be the slave SQL thread
+ --log-slow-sp-statements 
+ Log slow statements executed by stored procedure to the
+ slow log if it is open.
+ (Defaults to on; use --skip-log-slow-sp-statements to disable.)
+ --log-slow-verbosity=name 
+ Choose how verbose the messages to your slow log will be.
+ Multiple flags allowed in a comma-separated string.
+ [microtime, query_plan, innodb, profiling,
+ profiling_use_getrusage]
  --log-tc=name       Path to transaction coordinator log (used for
  transactions that affect more than one storage engine,
  when binary log is disabled).
@@ -347,6 +372,9 @@
  --log_queries_not_using_indexes is set.
  -W, --log-warnings[=#] 
  Log some not critical warnings to the log file
+ --log-warnings-suppress=name 
+ disable logging of enumerated warnings: 1592: unsafe
+ statements for binary logging; possible values : [1592]
  --long-query-time=# Log all queries that have taken more than long_query_time
  seconds to execute to file. The argument will be treated
  as a decimal value with microsecond precision
@@ -378,6 +406,11 @@
  --max-binlog-dump-events=# 
  Option used by mysql-test for debugging and testing of
  replication.
+ --max-binlog-files=# 
+ Maximum number of binlog files. Used with
+ --max-binlog-size this can be used to limit the total
+ amount of disk space used for the binlog. Default is 0,
+ don't limit.
  --max-binlog-size=# Binary log will be rotated automatically when the size
  exceeds this value. Will also apply to relay logs if
  max_relay_log_size is 0
@@ -684,6 +717,10 @@
  The minimum size for blocks allocated by the query cache
  --query-cache-size=# 
  The memory allocated to store results from old queries
+ --query-cache-strip-comments 
+ Enable and disable optimisation "strip comment for query
+ cache" - optimisation strip all comments from query while
+ search query result in query cache
  --query-cache-type=name 
  OFF = Don't cache or retrieve results. ON = Cache all
  results except SELECT SQL_NO_CACHE ... queries. DEMAND =
@@ -806,9 +843,10 @@
  --secure-auth       Disallow authentication for accounts that have old
  (pre-4.1) passwords
  (Defaults to on; use --skip-secure-auth to disable.)
- --secure-file-priv=name 
+ --secure-file-priv[=name] 
  Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to
- files within specified directory
+ files within specified directory. If no argument is
+ specified disable loading files.
  --server-id=#       Uniquely identifies the server instance in the community
  of replication partners
  --server-id-bits=#  Set number of significant bits in server-id
@@ -900,6 +938,18 @@
  Log slow queries to given log file. Defaults logging to
  hostname-slow.log. Must be enabled to activate other slow
  log options
+ --slow-query-log-timestamp-always 
+ Timestamp is printed for all records of the slow log even
+ if they are same time.
+ --slow-query-log-timestamp-precision=name 
+ Select the timestamp precision for use in the slow query
+ log.  [second, microsecond]
+ --slow-query-log-use-global-control=name 
+ Choose flags, wich always use the global variables.
+ Multiple flags allowed in a comma-separated string.
+ [none, log_slow_filter, log_slow_rate_limit,
+ log_slow_verbosity, long_query_time,
+ min_examined_row_limit, all]
  --socket=name       Socket file to use for connection
  --sort-buffer-size=# 
  Each thread that needs to do a sort allocates a buffer of
@@ -947,6 +997,8 @@
  Define threads usage for handling queries, one of
  one-thread-per-connection, no-threads, pool-of-threads
  --thread-stack=#    The stack size for each thread
+ --thread-statistics Control TABLE_STATISTICS running, when userstat is
+ enabled
  --time-format=name  The TIME format (ignored)
  --timed-mutexes     Specify whether to time mutexes (only InnoDB mutexes are
  currently supported)
@@ -975,8 +1027,19 @@
  of the underlying table and the query uses a LIMIT clause
  (usually get from GUI tools)
  -u, --user=name     Run mysqld daemon as user.
+ --userstat          Control USER_STATISTICS, CLIENT_STATISTICS,
+ THREAD_STATISTICS, INDEX_STATISTICS and TABLE_STATISTICS
+ running
+ --utility-user=name Specifies a MySQL user that will be added to the internal
+ list of users and recognized as the utility user.
+ --utility-user-password=name 
+ Specifies the password required for the utility user.
+ --utility-user-schema-access=name 
+ Specifies the schemas that the utility user has access to
+ in a comma delimited list.
  -v, --verbose       Used with --help option for detailed help.
  -V, --version       Output version information and exit.
+ -V, --version       Output version information and exit.
  --wait-timeout=#    The number of seconds the server waits for activity on a
  connection before closing it
  --xtradb-internal-hash-tables[=name] 
@@ -1037,6 +1100,7 @@
 div-precision-increment 4
 end-markers-in-json FALSE
 enforce-gtid-consistency FALSE
+enforce-storage-engine (No default value)
 eq-range-index-dive-limit 10
 event-scheduler OFF
 expand-fast-index-creation FALSE
@@ -1088,11 +1152,17 @@
 log-short-format FALSE
 log-slave-updates FALSE
 log-slow-admin-statements FALSE
+log-slow-filter 
+log-slow-rate-limit 1
+log-slow-rate-type session
 log-slow-slave-statements FALSE
+log-slow-sp-statements TRUE
+log-slow-verbosity 
 log-tc tc.log
 log-tc-size 24576
 log-throttle-queries-not-using-indexes 0
 log-warnings 1
+log-warnings-suppress 
 long-query-time 10
 low-priority-updates FALSE
 lower-case-table-names 1
@@ -1103,6 +1173,7 @@
 max-allowed-packet 4194304
 max-binlog-cache-size 18446744073709547520
 max-binlog-dump-events 0
+max-binlog-files 0
 max-binlog-size 1073741824
 max-binlog-stmt-cache-size 18446744073709547520
 max-connect-errors 100
@@ -1202,6 +1273,7 @@
 query-cache-limit 1048576
 query-cache-min-res-unit 4096
 query-cache-size 1048576
+query-cache-strip-comments FALSE
 query-cache-type OFF
 query-cache-wlock-invalidate FALSE
 query-prealloc-size 8192
@@ -1248,6 +1320,9 @@
 slave-type-conversions 
 slow-launch-time 2
 slow-query-log FALSE
+slow-query-log-timestamp-always FALSE
+slow-query-log-timestamp-precision second
+slow-query-log-use-global-control 
 sort-buffer-size 262144
 sporadic-binlog-dump-fail FALSE
 sql-mode NO_ENGINE_SUBSTITUTION
@@ -1264,6 +1339,7 @@
 thread-cache-size 9
 thread-handling one-thread-per-connection
 thread-stack 262144
+thread-statistics FALSE
 time-format %H:%i:%s
 timed-mutexes FALSE
 tmp-table-size 16777216
@@ -1272,6 +1348,10 @@
 transaction-prealloc-size 4096
 transaction-read-only FALSE
 updatable-views-with-limit YES
+userstat FALSE
+utility-user (No default value)
+utility-user-password (No default value)
+utility-user-schema-access (No default value)
 verbose TRUE
 wait-timeout 28800
 xtradb-internal-hash-tables ON
 
=== modified file 'Percona-Server/mysql-test/r/mysqld--help-win.result'
--- Percona-Server/mysql-test/r/mysqld--help-win.result	2013-03-21 06:31:46 +0000
+++ Percona-Server/mysql-test/r/mysqld--help-win.result	2013-05-20 14:30:50 +0000
@@ -191,6 +191,12 @@
  of doing index dives for equality ranges if the number of
  equality ranges for the index is larger than or equal to
  this number. If set to 0, index dives are always used.
+ --enforce-storage-engine=name
+ Force the use of a storage engine for new tables
+ --engine-condition-pushdown 
+ Push supported query conditions to the storage engine.
+ Deprecated, use --optimizer-switch instead.
+ (Defaults to on; use --skip-engine-condition-pushdown to disable.)
  --event-scheduler[=name] 
  Enable the event scheduler. Possible values are ON, OFF,
  and DISABLED (keep the event scheduler completely
@@ -377,6 +383,11 @@
  --max-binlog-dump-events=# 
  Option used by mysql-test for debugging and testing of
  replication.
+ --max-binlog-files=# 
+ Maximum number of binlog files. Used with
+ --max-binlog-size this can be used to limit the total
+ amount of disk space used for the binlog. Default is 0,
+ don't limit.
  --max-binlog-size=# Binary log will be rotated automatically when the size
  exceeds this value. Will also apply to relay logs if
  max_relay_log_size is 0
@@ -801,14 +812,16 @@
  not sure, leave this option unset
  --report-user=name  The account user name of the slave to be reported to the
  master during slave registration
+ --safe-mode         Skip some optimize stages (for testing). Deprecated.
  --safe-user-create  Don't allow new user creation by the user who has no
  write privileges to the mysql.user table.
  --secure-auth       Disallow authentication for accounts that have old
  (pre-4.1) passwords
  (Defaults to on; use --skip-secure-auth to disable.)
- --secure-file-priv=name 
+ --secure-file-priv[=name]
  Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to
- files within specified directory
+ files within specified directory. If no argument is
+ specified disable loading files.
  --server-id=#       Uniquely identifies the server instance in the community
  of replication partners
  --server-id-bits=#  Set number of significant bits in server-id
@@ -983,6 +996,13 @@
  of the underlying table and the query uses a LIMIT clause
  (usually get from GUI tools)
  -u, --user=name     Run mysqld daemon as user.
+ --utility-user=name Specifies a MySQL user that will be added to the internal
+ list of users and recognized as the utility user.
+ --utility-user-password=name 
+ Specifies the password required for the utility user.
+ --utility-user-schema-access=name 
+ Specifies the schemas that the utility user has access to
+ in a comma delimited list.
  -v, --verbose       Used with --help option for detailed help.
  -V, --version       Output version information and exit.
  --wait-timeout=#    The number of seconds the server waits for activity on a
@@ -1035,6 +1055,8 @@
 end-markers-in-json FALSE
 enforce-gtid-consistency FALSE
 eq-range-index-dive-limit 10
+enforce-storage-engine (No default value)
+engine-condition-pushdown TRUE
 event-scheduler OFF
 expand-fast-index-creation FALSE
 expire-logs-days 0
@@ -1099,6 +1121,7 @@
 max-allowed-packet 4194304
 max-binlog-cache-size 18446744073709547520
 max-binlog-dump-events 0
+max-binlog-files 0
 max-binlog-size 1073741824
 max-binlog-stmt-cache-size 18446744073709547520
 max-connect-errors 100
@@ -1272,6 +1295,9 @@
 transaction-prealloc-size 4096
 transaction-read-only FALSE
 updatable-views-with-limit YES
+utility-user (No default value)
+utility-user-password (No default value)
+utility-user-schema-access (No default value)
 verbose TRUE
 wait-timeout 28800
 
 
=== modified file 'Percona-Server/mysql-test/r/mysqlshow.result'
--- Percona-Server/mysql-test/r/mysqlshow.result	2013-03-05 12:46:43 +0000
+++ Percona-Server/mysql-test/r/mysqlshow.result	2013-05-20 14:30:50 +0000
@@ -80,10 +80,12 @@
 |                Tables                 |
 +---------------------------------------+
 | CHARACTER_SETS                        |
+| CLIENT_STATISTICS                     |
 | COLLATIONS                            |
 | COLLATION_CHARACTER_SET_APPLICABILITY |
 | COLUMNS                               |
 | COLUMN_PRIVILEGES                     |
+| INDEX_STATISTICS                      |
 | ENGINES                               |
 | EVENTS                                |
 | FILES                                 |
@@ -108,9 +110,12 @@
 | TABLESPACES                           |
 | TABLE_CONSTRAINTS                     |
 | TABLE_PRIVILEGES                      |
+| TABLE_STATISTICS                      |
 | TEMPORARY_TABLES                      |
+| THREAD_STATISTICS                     |
 | TRIGGERS                              |
 | USER_PRIVILEGES                       |
+| USER_STATISTICS                       |
 | VIEWS                                 |
 | INNODB_CMP                            |
 | XTRADB_INTERNAL_HASH_TABLES           |
@@ -130,7 +135,7 @@
 | INNODB_LOCK_WAITS                     |
 | INNODB_SYS_FIELDS                     |
 | INNODB_CMPMEM                         |
-| INNODB_BUFFER_PAGE                    |
+| INNODB_CHANGED_PAGES                  |
 | INNODB_SYS_COLUMNS                    |
 | INNODB_FT_INDEX_TABLE                 |
 | INNODB_CMP_PER_INDEX_RESET            |
@@ -144,16 +149,19 @@
 | INNODB_SYS_TABLES                     |
 | INNODB_FT_DEFAULT_STOPWORD            |
 | INNODB_FT_CONFIG                      |
+| INNODB_BUFFER_PAGE                    |
 +---------------------------------------+
 Database: INFORMATION_SCHEMA
 +---------------------------------------+
 |                Tables                 |
 +---------------------------------------+
 | CHARACTER_SETS                        |
+| CLIENT_STATISTICS                     |
 | COLLATIONS                            |
 | COLLATION_CHARACTER_SET_APPLICABILITY |
 | COLUMNS                               |
 | COLUMN_PRIVILEGES                     |
+| INDEX_STATISTICS                      |
 | ENGINES                               |
 | EVENTS                                |
 | FILES                                 |
@@ -178,9 +186,12 @@
 | TABLESPACES                           |
 | TABLE_CONSTRAINTS                     |
 | TABLE_PRIVILEGES                      |
+| TABLE_STATISTICS                      |
 | TEMPORARY_TABLES                      |
+| THREAD_STATISTICS                     |
 | TRIGGERS                              |
 | USER_PRIVILEGES                       |
+| USER_STATISTICS                       |
 | VIEWS                                 |
 | INNODB_CMP                            |
 | XTRADB_INTERNAL_HASH_TABLES           |
@@ -200,7 +211,7 @@
 | INNODB_LOCK_WAITS                     |
 | INNODB_SYS_FIELDS                     |
 | INNODB_CMPMEM                         |
-| INNODB_BUFFER_PAGE                    |
+| INNODB_CHANGED_PAGES                  |
 | INNODB_SYS_COLUMNS                    |
 | INNODB_FT_INDEX_TABLE                 |
 | INNODB_CMP_PER_INDEX_RESET            |
@@ -214,6 +225,7 @@
 | INNODB_SYS_TABLES                     |
 | INNODB_FT_DEFAULT_STOPWORD            |
 | INNODB_FT_CONFIG                      |
+| INNODB_BUFFER_PAGE                    |
 +---------------------------------------+
 Wildcard: inf_rmation_schema
 +--------------------+
 
=== added file 'Percona-Server/mysql-test/r/percona_bug1008278.result'
--- Percona-Server/mysql-test/r/percona_bug1008278.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug1008278.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,11 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+[connection master]
+DROP TABLE IF EXISTS t;
+CREATE TABLE t(id INT,data CHAR(30));
+INSERT INTO t VALUES
+(1,"aaaaabbbbbcccccdddddeeeeefffff");
+DROP TABLE t;
+include/rpl_end.inc
 
=== added file 'Percona-Server/mysql-test/r/percona_bug1008609.result'
--- Percona-Server/mysql-test/r/percona_bug1008609.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug1008609.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,1 @@
+OK
 
=== added file 'Percona-Server/mysql-test/r/percona_bug1017192.result'
--- Percona-Server/mysql-test/r/percona_bug1017192.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug1017192.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,10 @@
+SET DEBUG_SYNC='reset';
+CREATE TABLE IF NOT EXISTS t1 (`a` INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2),(3),(4);
+SET DEBUG_SYNC='after_copy_data_between_tables SIGNAL run_show_innodb_status
+                   WAIT_FOR show_innodb_status_done';
+ALTER TABLE t1 PARTITION BY HASH (`a`) PARTITIONS 4 ;
+SET DEBUG_SYNC='now WAIT_FOR run_show_innodb_status';
+SHOW ENGINE INNODB STATUS;
+SET DEBUG_SYNC='now SIGNAL show_innodb_status_done';
+DROP TABLE t1;
 
=== added file 'Percona-Server/mysql-test/r/percona_bug1035225.result'
--- Percona-Server/mysql-test/r/percona_bug1035225.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug1035225.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,32 @@
+CREATE TABLE t(
+id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+k INT,
+c CHAR(1),
+UNIQUE KEY(k)) ENGINE=InnoDB;
+#
+# Connection 1
+#
+SET DEBUG_SYNC='ha_write_row_end SIGNAL continue2 WAIT_FOR continue1';
+affected rows: 0
+INSERT INTO t(k) VALUES (1), (2), (3) ON DUPLICATE KEY UPDATE c='1';
+#
+# Connection 2
+#
+SET DEBUG_SYNC='start_ha_write_row WAIT_FOR continue2';
+affected rows: 0
+SET DEBUG_SYNC='after_mysql_insert SIGNAL continue1';
+affected rows: 0
+INSERT INTO t(k) VALUES (2), (4), (5) ON DUPLICATE KEY UPDATE c='2';
+affected rows: 3
+info: Records: 3  Duplicates: 0  Warnings: 0
+affected rows: 4
+info: Records: 3  Duplicates: 1  Warnings: 0
+SET DEBUG_SYNC='RESET';
+SELECT * FROM t ORDER BY k;
+id	k	c
+1	1	NULL
+4	2	1
+2	3	NULL
+5	4	NULL
+6	5	NULL
+DROP TABLE t;
 
=== added file 'Percona-Server/mysql-test/r/percona_bug45702.result'
--- Percona-Server/mysql-test/r/percona_bug45702.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug45702.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,21 @@
+CREATE TABLE t1 (a BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE=MyISAM;
+INSERT INTO t1 VALUES (), (), (), (), (), (), (), ();
+INSERT INTO t1 SELECT NULL FROM t1;
+INSERT INTO t1 SELECT NULL FROM t1;
+INSERT INTO t1 SELECT NULL FROM t1;
+INSERT INTO t1 SELECT NULL FROM t1;
+INSERT INTO t1 SELECT NULL FROM t1;
+INSERT INTO t1 SELECT NULL FROM t1;
+INSERT INTO t1 SELECT NULL FROM t1;
+INSERT INTO t1 SELECT NULL FROM t1;
+INSERT INTO t1 SELECT NULL FROM t1;
+SET @old_myisam_sort_buffer_size = @@myisam_sort_buffer_size;
+SET @@myisam_sort_buffer_size = 4 * 1024 * 1024 * 1024;
+REPAIR TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	repair	status	OK
+- recovering (with sort) MyISAM-table 'MYSQLD_DATADIR/test/t1'
+Data records: 4096
+- Fixing index 1
+SET @@myisam_sort_buffer_size = @old_myisam_sort_buffer_size;
+DROP TABLE t1;
 
=== added file 'Percona-Server/mysql-test/r/percona_bug643149.result'
--- Percona-Server/mysql-test/r/percona_bug643149.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug643149.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,21 @@
+SET @old_slow_query_log_file=@@global.slow_query_log_file;
+SET GLOBAL slow_query_log=on;
+SET LOCAL log_slow_verbosity='profiling';
+SET LOCAL long_query_time=0;
+SET GLOBAL slow_query_log_file='MYSQLTEST_VARDIR/percona_bug643149_slow.log';;
+SELECT 1;
+1
+1
+# User@Host: root[root] @ localhost []  Id: X
+# Schema: test  Last_errno: X  Killed: X
+# Query_time: X.X  Lock_time: X.X  Rows_sent: X  Rows_examined: X  Rows_affected: X  Rows_read: X
+# Bytes_sent: X
+# Profile_starting: X.X Profile_starting_cpu: X.X Profile_Opening_tables: X.X Profile_Opening_tables_cpu: X.X Profile_query_end: X.X Profile_query_end_cpu: X.X Profile_closing_tables: X.X Profile_closing_tables_cpu: X.X Profile_freeing_items: X.X Profile_freeing_items_cpu: X.X Profile_logging_slow_query: X.X Profile_logging_slow_query_cpu: X.X 
+# Profile_total: X.X Profile_total_cpu: X.X 
+# User@Host: root[root] @ localhost []  Id: X
+# Schema: test  Last_errno: X  Killed: X
+# Query_time: X.X  Lock_time: X.X  Rows_sent: X  Rows_examined: X  Rows_affected: X  Rows_read: X
+# Bytes_sent: X
+# Profile_starting: X.X Profile_starting_cpu: X.X Profile_checking_permissions: X.X Profile_checking_permissions_cpu: X.X Profile_Opening_tables: X.X Profile_Opening_tables_cpu: X.X Profile_init: X.X Profile_init_cpu: X.X Profile_optimizing: X.X Profile_optimizing_cpu: X.X Profile_executing: X.X Profile_executing_cpu: X.X Profile_end: X.X Profile_end_cpu: X.X Profile_query_end: X.X Profile_query_end_cpu: X.X Profile_closing_tables: X.X Profile_closing_tables_cpu: X.X Profile_freeing_items: X.X Profile_freeing_items_cpu: X.X Profile_logging_slow_query: X.X Profile_logging_slow_query_cpu: X.X 
+# Profile_total: X.X Profile_total_cpu: X.X 
+SET GLOBAL slow_query_log_file=@old_slow_query_log_file;
 
=== added file 'Percona-Server/mysql-test/r/percona_bug856404.result'
--- Percona-Server/mysql-test/r/percona_bug856404.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug856404.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS table17_int;
+DROP TABLE IF EXISTS table30_int;
+CREATE TABLE `table17_int` (pk integer auto_increment primary key, `col_char_10_not_null_key` char(10), `col_enum_not_null_key` int);
+CREATE TABLE `table30_int` (pk integer auto_increment primary key, `col_enum_not_null_key` int);
+SELECT X . `pk` FROM `table17_int` AS X LEFT JOIN `table30_int` AS Y USING ( `col_enum_not_null_key` ) WHERE X . `col_char_10_not_null_key` != '   you need to translate Views labels into other languages, consider installing the <a href=\" !path\">Internationalization</a> package\'s Views translation module.' LIMIT 7  /*Generated by THREAD_ID 1*/;
+pk
+DROP TABLE table17_int;
+DROP TABLE table30_int;
 
=== added file 'Percona-Server/mysql-test/r/percona_enforce_storage_engine.result'
--- Percona-Server/mysql-test/r/percona_enforce_storage_engine.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_enforce_storage_engine.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,36 @@
+drop table if exists t1;
+SET @old_sql_mode= @@session.sql_mode;
+CREATE TABLE t1 (c1 INT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=MyISAM;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` int(11) NOT NULL AUTO_INCREMENT,
+  `c2` varchar(10) DEFAULT NULL,
+  PRIMARY KEY (`c1`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1;
+SET SESSION sql_mode='';
+CREATE TABLE t1 (c1 INT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
+Warnings:
+Note	1266	Using storage engine MyISAM for table 't1'
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` int(11) NOT NULL AUTO_INCREMENT,
+  `c2` varchar(10) DEFAULT NULL,
+  PRIMARY KEY (`c1`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1;
+SET SESSION sql_mode='NO_ENGINE_SUBSTITUTION';
+CREATE TABLE t1 (c1 INT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=MyISAM;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` int(11) NOT NULL AUTO_INCREMENT,
+  `c2` varchar(10) DEFAULT NULL,
+  PRIMARY KEY (`c1`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1;
+CREATE TABLE t1 (c1 INT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
+ERROR 42000: Unknown storage engine 'InnoDB'
+SET SESSION sql_mode=@old_sql_mode;
 
=== added file 'Percona-Server/mysql-test/r/percona_enhanced_options_modifiers.result'
--- Percona-Server/mysql-test/r/percona_enhanced_options_modifiers.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_enhanced_options_modifiers.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,142 @@
+SET @TEMP=@@GLOBAL.AUTO_INCREMENT_INCREMENT;
+SET @@GLOBAL.AUTO_INCREMENT_INCREMENT=1;
+SELECT @@GLOBAL.AUTO_INCREMENT_INCREMENT;
+@@GLOBAL.AUTO_INCREMENT_INCREMENT
+1
+SET @@GLOBAL.AUTO_INCREMENT_INCREMENT=2;
+SELECT @@GLOBAL.AUTO_INCREMENT_INCREMENT;
+@@GLOBAL.AUTO_INCREMENT_INCREMENT
+2
+SET @@GLOBAL.AUTO_INCREMENT_INCREMENT=15;
+SELECT @@GLOBAL.AUTO_INCREMENT_INCREMENT;
+@@GLOBAL.AUTO_INCREMENT_INCREMENT
+15
+SET @@GLOBAL.AUTO_INCREMENT_INCREMENT=@TEMP;
+SET @TEMP=@@LOCAL.AUTO_INCREMENT_INCREMENT;
+SET @@LOCAL.AUTO_INCREMENT_INCREMENT=1;
+SELECT @@LOCAL.AUTO_INCREMENT_INCREMENT;
+@@LOCAL.AUTO_INCREMENT_INCREMENT
+1
+SET @@LOCAL.AUTO_INCREMENT_INCREMENT=2;
+SELECT @@LOCAL.AUTO_INCREMENT_INCREMENT;
+@@LOCAL.AUTO_INCREMENT_INCREMENT
+2
+SET @@LOCAL.AUTO_INCREMENT_INCREMENT=15;
+SELECT @@LOCAL.AUTO_INCREMENT_INCREMENT;
+@@LOCAL.AUTO_INCREMENT_INCREMENT
+15
+SET @@LOCAL.AUTO_INCREMENT_INCREMENT=@TEMP;
+SET @@GLOBAL.AUTO_INCREMENT_OFFSET=5;
+SET @@LOCAL.AUTO_INCREMENT_OFFSET=5;
+SELECT @@GLOBAL.AUTOCOMMIT;
+@@GLOBAL.AUTOCOMMIT
+1
+SELECT @@LOCAL.AUTOCOMMIT;
+@@LOCAL.AUTOCOMMIT
+1
+SET @@GLOBAL.AUTOCOMMIT= TRUE;
+SET @@LOCAL.AUTOCOMMIT= TRUE;
+SET @TEMP=@@GLOBAL.INNODB_IO_CAPACITY;
+SET @@GLOBAL.INNODB_IO_CAPACITY=100;
+SELECT @@GLOBAL.INNODB_IO_CAPACITY;
+@@GLOBAL.INNODB_IO_CAPACITY
+100
+SET @@GLOBAL.INNODB_IO_CAPACITY=300;
+SELECT @@GLOBAL.INNODB_IO_CAPACITY;
+@@GLOBAL.INNODB_IO_CAPACITY
+300
+SET @@GLOBAL.INNODB_IO_CAPACITY=160;
+SELECT @@GLOBAL.INNODB_IO_CAPACITY;
+@@GLOBAL.INNODB_IO_CAPACITY
+160
+SET @@GLOBAL.INNODB_IO_CAPACITY=@TEMP;
+SET @@GLOBAL.INNODB_SPIN_WAIT_DELAY=10;
+SET @@GLOBAL.INNODB_READ_AHEAD_THRESHOLD=32;
+SET @TEMP=@@GLOBAL.AUTO_INCREMENT_INCREMENT;
+SET @@GLOBAL.AUTO_INCREMENT_INCREMENT=1;
+Warnings:
+Warning	1292	Truncated incorrect auto_increment_increment value: '1'
+SELECT @@GLOBAL.AUTO_INCREMENT_INCREMENT;
+@@GLOBAL.AUTO_INCREMENT_INCREMENT
+5
+SET @@GLOBAL.AUTO_INCREMENT_INCREMENT=2;
+Warnings:
+Warning	1292	Truncated incorrect auto_increment_increment value: '2'
+SELECT @@GLOBAL.AUTO_INCREMENT_INCREMENT;
+@@GLOBAL.AUTO_INCREMENT_INCREMENT
+5
+SET @@GLOBAL.AUTO_INCREMENT_INCREMENT=15;
+Warnings:
+Warning	1292	Truncated incorrect auto_increment_increment value: '15'
+SELECT @@GLOBAL.AUTO_INCREMENT_INCREMENT;
+@@GLOBAL.AUTO_INCREMENT_INCREMENT
+10
+SET @@GLOBAL.AUTO_INCREMENT_INCREMENT=@TEMP;
+SET @TEMP=@@LOCAL.AUTO_INCREMENT_INCREMENT;
+SET @@LOCAL.AUTO_INCREMENT_INCREMENT=1;
+Warnings:
+Warning	1292	Truncated incorrect auto_increment_increment value: '1'
+SELECT @@LOCAL.AUTO_INCREMENT_INCREMENT;
+@@LOCAL.AUTO_INCREMENT_INCREMENT
+5
+SET @@LOCAL.AUTO_INCREMENT_INCREMENT=2;
+Warnings:
+Warning	1292	Truncated incorrect auto_increment_increment value: '2'
+SELECT @@LOCAL.AUTO_INCREMENT_INCREMENT;
+@@LOCAL.AUTO_INCREMENT_INCREMENT
+5
+SET @@LOCAL.AUTO_INCREMENT_INCREMENT=15;
+Warnings:
+Warning	1292	Truncated incorrect auto_increment_increment value: '15'
+SELECT @@LOCAL.AUTO_INCREMENT_INCREMENT;
+@@LOCAL.AUTO_INCREMENT_INCREMENT
+10
+SET @@LOCAL.AUTO_INCREMENT_INCREMENT=@TEMP;
+SET @@GLOBAL.AUTO_INCREMENT_OFFSET=5;
+ERROR HY000: Variable 'auto_increment_offset' is a read only variable
+SET @@LOCAL.AUTO_INCREMENT_OFFSET=5;
+ERROR HY000: Variable 'auto_increment_offset' is a read only variable
+SELECT @@GLOBAL.AUTOCOMMIT;
+ERROR HY000: Unknown system variable 'AUTOCOMMIT'
+SELECT @@LOCAL.AUTOCOMMIT;
+ERROR HY000: Unknown system variable 'AUTOCOMMIT'
+SET @@GLOBAL.AUTOCOMMIT= TRUE;
+ERROR HY000: Unknown system variable 'AUTOCOMMIT'
+SET @@LOCAL.AUTOCOMMIT= TRUE;
+ERROR HY000: Unknown system variable 'AUTOCOMMIT'
+SET @TEMP=@@GLOBAL.INNODB_IO_CAPACITY;
+SET @@GLOBAL.INNODB_IO_CAPACITY=100;
+Warnings:
+Warning	1292	Truncated incorrect innodb_io_capacity value: '100'
+SELECT @@GLOBAL.INNODB_IO_CAPACITY;
+@@GLOBAL.INNODB_IO_CAPACITY
+150
+SET @@GLOBAL.INNODB_IO_CAPACITY=300;
+SELECT @@GLOBAL.INNODB_IO_CAPACITY;
+@@GLOBAL.INNODB_IO_CAPACITY
+300
+SET @@GLOBAL.INNODB_IO_CAPACITY=160;
+SELECT @@GLOBAL.INNODB_IO_CAPACITY;
+@@GLOBAL.INNODB_IO_CAPACITY
+160
+SET @@GLOBAL.INNODB_IO_CAPACITY=@TEMP;
+SET @@GLOBAL.INNODB_SPIN_WAIT_DELAY=10;
+ERROR HY000: Variable 'innodb_spin_wait_delay' is a read only variable
+SET @@GLOBAL.INNODB_READ_AHEAD_THRESHOLD=32;
+ERROR HY000: Unknown system variable 'INNODB_READ_AHEAD_THRESHOLD'
+SET @@GLOBAL.AUTO_INCREMENT_OFFSET=5;
+ERROR HY000: Variable 'auto_increment_offset' is a read only variable
+SET @@LOCAL.AUTO_INCREMENT_OFFSET=5;
+ERROR HY000: Variable 'auto_increment_offset' is a read only variable
+SELECT @@GLOBAL.AUTOCOMMIT;
+ERROR HY000: Unknown system variable 'AUTOCOMMIT'
+SELECT @@LOCAL.AUTOCOMMIT;
+ERROR HY000: Unknown system variable 'AUTOCOMMIT'
+SET @@GLOBAL.AUTOCOMMIT= TRUE;
+ERROR HY000: Unknown system variable 'AUTOCOMMIT'
+SET @@LOCAL.AUTOCOMMIT= TRUE;
+ERROR HY000: Unknown system variable 'AUTOCOMMIT'
+SET @@GLOBAL.INNODB_SPIN_WAIT_DELAY=10;
+ERROR HY000: Variable 'innodb_spin_wait_delay' is a read only variable
+SET @@GLOBAL.INNODB_READ_AHEAD_THRESHOLD=72;
+ERROR HY000: Unknown system variable 'INNODB_READ_AHEAD_THRESHOLD'
 
=== modified file 'Percona-Server/mysql-test/r/percona_expand_fast_index_creation.result'
--- Percona-Server/mysql-test/r/percona_expand_fast_index_creation.result	2013-01-25 11:46:09 +0000
+++ Percona-Server/mysql-test/r/percona_expand_fast_index_creation.result	2013-05-20 14:30:50 +0000
@@ -76,3 +76,67 @@
 10
 DROP TABLE idx;
 DROP TABLE t;
+CREATE TABLE t1(
+id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+a CHAR(1) NOT NULL,
+b CHAR(36) NOT NULL) ENGINE=InnoDB;
+INSERT INTO t1(a,b) VALUES ('a','b');
+INSERT INTO t1(a,b) SELECT a,b FROM t1;
+INSERT INTO t1(a,b) SELECT a,b FROM t1;
+INSERT INTO t1(a,b) SELECT a,b FROM t1;
+INSERT INTO t1(a,b) SELECT a,b FROM t1;
+ALTER TABLE t1 ADD KEY (a);
+affected rows: 0
+info: Records: 0  Duplicates: 0  Warnings: 0
+EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b;
+id	1
+select_type	SIMPLE
+table	t1
+type	ALL
+possible_keys	a
+key	NULL
+key_len	NULL
+ref	NULL
+rows	16
+Extra	NULL
+id	1
+select_type	SIMPLE
+table	t2
+type	ALL
+possible_keys	a
+key	NULL
+key_len	NULL
+ref	NULL
+rows	16
+Extra	Using where; Using join buffer (Block Nested Loop)
+ALTER TABLE t1 DROP KEY a;
+SET expand_fast_index_creation = 1;
+SELECT @@expand_fast_index_creation;
+@@expand_fast_index_creation
+1
+ALTER TABLE t1 ADD KEY (a);
+affected rows: 0
+info: Records: 0  Duplicates: 0  Warnings: 0
+EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b;
+id	1
+select_type	SIMPLE
+table	t1
+type	ALL
+possible_keys	a
+key	NULL
+key_len	NULL
+ref	NULL
+rows	16
+Extra	NULL
+id	1
+select_type	SIMPLE
+table	t2
+type	ALL
+possible_keys	a
+key	NULL
+key_len	NULL
+ref	NULL
+rows	16
+Extra	Using where; Using join buffer (Block Nested Loop)
+SET expand_fast_index_creation = 0;
+DROP TABLE t1;
 
=== added file 'Percona-Server/mysql-test/r/percona_heap_blob.result'
--- Percona-Server/mysql-test/r/percona_heap_blob.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_heap_blob.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,918 @@
+SET @old_default_storage_engine=@@default_storage_engine;
+SET default_storage_engine=MEMORY;
+drop table if exists t1,t2,t3,t4,t5,t6,t7;
+CREATE TABLE t1 (a blob, b text, c blob(250), d text(70000), e text(70000000));
+show columns from t1;
+Field	Type	Null	Key	Default	Extra
+a	blob	YES		NULL	
+b	text	YES		NULL	
+c	tinyblob	YES		NULL	
+d	mediumtext	YES		NULL	
+e	longtext	YES		NULL	
+CREATE TABLE t2 (a char(255), b varbinary(70000), c varchar(70000000));
+Warnings:
+Note	1246	Converting column 'b' from VARBINARY to BLOB
+Note	1246	Converting column 'c' from VARCHAR to TEXT
+CREATE TABLE t4 (c varchar(65530) character set utf8 not null);
+Warnings:
+Note	1246	Converting column 'c' from VARCHAR to TEXT
+show columns from t2;
+Field	Type	Null	Key	Default	Extra
+a	char(255)	YES		NULL	
+b	mediumblob	YES		NULL	
+c	longtext	YES		NULL	
+create table t3 (a long, b long byte);
+show create TABLE t3;
+Table	Create Table
+t3	CREATE TABLE `t3` (
+  `a` mediumtext,
+  `b` mediumblob
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
+show create TABLE t4;
+Table	Create Table
+t4	CREATE TABLE `t4` (
+  `c` mediumtext CHARACTER SET utf8 NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
+drop table t1,t2,t3,t4;
+CREATE TABLE t1 (a char(257) default "hello");
+ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead
+CREATE TABLE t2 (a char(256));
+ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead
+CREATE TABLE t1 (a varchar(70000) default "hello");
+ERROR 42000: Column length too big for column 'a' (max = 65535); use BLOB or TEXT instead
+CREATE TABLE t2 (a blob default "hello");
+ERROR 42000: BLOB/TEXT column 'a' can't have a default value
+drop table if exists t1,t2;
+create table t1 (nr int(5) not null auto_increment,b blob,str char(10), primary key (nr));
+insert into t1 values (null,"a","A");
+insert into t1 values (null,"bbb","BBB");
+insert into t1 values (null,"ccc","CCC");
+select last_insert_id();
+last_insert_id()
+3
+select * from t1,t1 as t2;
+nr	b	str	nr	b	str
+1	a	A	1	a	A
+2	bbb	BBB	1	a	A
+3	ccc	CCC	1	a	A
+1	a	A	2	bbb	BBB
+2	bbb	BBB	2	bbb	BBB
+3	ccc	CCC	2	bbb	BBB
+1	a	A	3	ccc	CCC
+2	bbb	BBB	3	ccc	CCC
+3	ccc	CCC	3	ccc	CCC
+drop table t1;
+create table t1 (a text);
+insert into t1 values ('where');
+update t1 set a='Where';
+select * from t1;
+a
+Where
+drop table t1;
+create table t1 (t text,c char(10),b blob, d varbinary(10)) collate latin1_general_cs;
+insert into t1 values (NULL,NULL,NULL,NULL);
+insert into t1 values ("","","","");
+insert into t1 values ("hello","hello","hello","hello");
+insert into t1 values ("HELLO","HELLO","HELLO","HELLO");
+insert into t1 values ("HELLO MY","HELLO MY","HELLO MY","HELLO MY");
+insert into t1 values ("a","a","a","a");
+insert into t1 values (1,1,1,1);
+insert into t1 values (NULL,NULL,NULL,NULL);
+update t1 set c="",b=null where c="1";
+lock tables t1 READ;
+show full fields from t1;
+Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
+t	text	latin1_general_cs	YES		NULL		#	
+c	char(10)	latin1_general_cs	YES		NULL		#	
+b	blob	NULL	YES		NULL		#	
+d	varbinary(10)	NULL	YES		NULL		#	
+lock tables t1 WRITE;
+show full fields from t1;
+Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
+t	text	latin1_general_cs	YES		NULL		#	
+c	char(10)	latin1_general_cs	YES		NULL		#	
+b	blob	NULL	YES		NULL		#	
+d	varbinary(10)	NULL	YES		NULL		#	
+unlock tables;
+select t from t1 where t like "hello";
+t
+hello
+select c from t1 where c like "hello";
+c
+hello
+select b from t1 where b like "hello";
+b
+hello
+select d from t1 where d like "hello";
+d
+hello
+select c from t1 having c like "hello";
+c
+hello
+select d from t1 having d like "hello";
+d
+hello
+select t from t1 where t like "%HELLO%";
+t
+HELLO
+HELLO MY
+select c from t1 where c like "%HELLO%";
+c
+HELLO
+HELLO MY
+select b from t1 where b like "%HELLO%";
+b
+HELLO
+HELLO MY
+select d from t1 where d like "%HELLO%";
+d
+HELLO
+HELLO MY
+select c from t1 having c like "%HELLO%";
+c
+HELLO
+HELLO MY
+select d from t1 having d like "%HELLO%";
+d
+HELLO
+HELLO MY
+select d from t1 having d like "%HE%LLO%";
+d
+HELLO
+HELLO MY
+select t from t1 order by t;
+t
+NULL
+NULL
+
+1
+a
+HELLO
+HELLO MY
+hello
+select c from t1 order by c;
+c
+NULL
+NULL
+
+
+a
+HELLO
+HELLO MY
+hello
+select b from t1 order by b;
+b
+NULL
+NULL
+NULL
+
+HELLO
+HELLO MY
+a
+hello
+select d from t1 order by d;
+d
+NULL
+NULL
+
+1
+HELLO
+HELLO MY
+a
+hello
+select distinct t from t1;
+t
+NULL
+
+hello
+HELLO
+HELLO MY
+a
+1
+select distinct b from t1;
+b
+NULL
+
+hello
+HELLO
+HELLO MY
+a
+select distinct t from t1 order by t;
+t
+NULL
+
+1
+a
+HELLO
+HELLO MY
+hello
+select distinct b from t1 order by b;
+b
+NULL
+
+HELLO
+HELLO MY
+a
+hello
+select t from t1 group by t;
+t
+NULL
+
+1
+a
+HELLO
+HELLO MY
+hello
+select b from t1 group by b;
+b
+NULL
+
+HELLO
+HELLO MY
+a
+hello
+select distinct c from t1;
+c
+NULL
+
+hello
+HELLO
+HELLO MY
+a
+select distinct d from t1;
+d
+NULL
+
+hello
+HELLO
+HELLO MY
+a
+1
+select distinct c from t1 order by c;
+c
+NULL
+
+a
+HELLO
+HELLO MY
+hello
+select distinct d from t1 order by d;
+d
+NULL
+
+1
+HELLO
+HELLO MY
+a
+hello
+select c from t1 group by c;
+c
+NULL
+
+a
+HELLO
+HELLO MY
+hello
+select d from t1 group by d;
+d
+NULL
+
+1
+HELLO
+HELLO MY
+a
+hello
+select distinct * from t1;
+t	c	b	d
+NULL	NULL	NULL	NULL
+			
+hello	hello	hello	hello
+HELLO	HELLO	HELLO	HELLO
+HELLO MY	HELLO MY	HELLO MY	HELLO MY
+a	a	a	a
+1		NULL	1
+select t,count(*) from t1 group by t;
+t	count(*)
+NULL	2
+	1
+1	1
+a	1
+HELLO	1
+HELLO MY	1
+hello	1
+select b,count(*) from t1 group by b;
+b	count(*)
+NULL	3
+	1
+HELLO	1
+HELLO MY	1
+a	1
+hello	1
+select c,count(*) from t1 group by c;
+c	count(*)
+NULL	2
+	2
+a	1
+HELLO	1
+HELLO MY	1
+hello	1
+select d,count(*) from t1 group by d;
+d	count(*)
+NULL	2
+	1
+1	1
+HELLO	1
+HELLO MY	1
+a	1
+hello	1
+drop table t1;
+CREATE TABLE t1 (
+t1_id bigint(21) NOT NULL auto_increment,
+_field_72 varchar(128) DEFAULT '' NOT NULL,
+_field_95 varchar(32),
+_field_115 tinyint(4) DEFAULT '0' NOT NULL,
+_field_122 tinyint(4) DEFAULT '0' NOT NULL,
+_field_126 tinyint(4),
+_field_134 tinyint(4),
+PRIMARY KEY (t1_id),
+UNIQUE _field_72 (_field_72),
+KEY _field_115 (_field_115),
+KEY _field_122 (_field_122)
+);
+INSERT INTO t1 VALUES (1,'admin','21232f297a57a5a743894a0e4a801fc3',0,1,NULL,NULL);
+INSERT INTO t1 VALUES (2,'hroberts','7415275a8c95952901e42b13a6b78566',0,1,NULL,NULL);
+INSERT INTO t1 VALUES (3,'guest','d41d8cd98f00b204e9800998ecf8427e',1,0,NULL,NULL);
+CREATE TABLE t2 (
+seq_0_id bigint(21) DEFAULT '0' NOT NULL,
+seq_1_id bigint(21) DEFAULT '0' NOT NULL,
+PRIMARY KEY (seq_0_id,seq_1_id)
+);
+INSERT INTO t2 VALUES (1,1);
+INSERT INTO t2 VALUES (2,1);
+INSERT INTO t2 VALUES (2,2);
+CREATE TABLE t3 (
+t3_id bigint(21) NOT NULL auto_increment,
+_field_131 varchar(128),
+_field_133 tinyint(4) DEFAULT '0' NOT NULL,
+_field_135 datetime DEFAULT '0000-00-00 00:00:00' NOT NULL,
+_field_137 tinyint(4),
+_field_139 datetime DEFAULT '0000-00-00 00:00:00' NOT NULL,
+_field_140 blob,
+_field_142 tinyint(4) DEFAULT '0' NOT NULL,
+_field_145 tinyint(4) DEFAULT '0' NOT NULL,
+_field_148 tinyint(4) DEFAULT '0' NOT NULL,
+PRIMARY KEY (t3_id),
+KEY _field_133 (_field_133),
+KEY _field_135 (_field_135),
+KEY _field_139 (_field_139),
+KEY _field_142 (_field_142),
+KEY _field_145 (_field_145),
+KEY _field_148 (_field_148)
+);
+INSERT INTO t3 VALUES (1,'test job 1',0,'0000-00-00 00:00:00',0,'1999-02-25 22:43:32','test\r\njob\r\n1',0,0,0);
+INSERT INTO t3 VALUES (2,'test job 2',0,'0000-00-00 00:00:00',0,'1999-02-26 21:08:04','',0,0,0);
+CREATE TABLE t4 (
+seq_0_id bigint(21) DEFAULT '0' NOT NULL,
+seq_1_id bigint(21) DEFAULT '0' NOT NULL,
+PRIMARY KEY (seq_0_id,seq_1_id)
+);
+INSERT INTO t4 VALUES (1,1);
+INSERT INTO t4 VALUES (2,1);
+CREATE TABLE t5 (
+t5_id bigint(21) NOT NULL auto_increment,
+_field_149 tinyint(4),
+_field_156 varchar(128) DEFAULT '' NOT NULL,
+_field_157 varchar(128) DEFAULT '' NOT NULL,
+_field_158 varchar(128) DEFAULT '' NOT NULL,
+_field_159 varchar(128) DEFAULT '' NOT NULL,
+_field_160 varchar(128) DEFAULT '' NOT NULL,
+_field_161 varchar(128) DEFAULT '' NOT NULL,
+PRIMARY KEY (t5_id),
+KEY _field_156 (_field_156),
+KEY _field_157 (_field_157),
+KEY _field_158 (_field_158),
+KEY _field_159 (_field_159),
+KEY _field_160 (_field_160),
+KEY _field_161 (_field_161)
+);
+INSERT INTO t5 VALUES (1,0,'tomato','','','','','');
+INSERT INTO t5 VALUES (2,0,'cilantro','','','','','');
+CREATE TABLE t6 (
+seq_0_id bigint(21) DEFAULT '0' NOT NULL,
+seq_1_id bigint(21) DEFAULT '0' NOT NULL,
+PRIMARY KEY (seq_0_id,seq_1_id)
+);
+INSERT INTO t6 VALUES (1,1);
+INSERT INTO t6 VALUES (1,2);
+INSERT INTO t6 VALUES (2,2);
+CREATE TABLE t7 (
+t7_id bigint(21) NOT NULL auto_increment,
+_field_143 tinyint(4),
+_field_165 varchar(32),
+_field_166 smallint(6) DEFAULT '0' NOT NULL,
+PRIMARY KEY (t7_id),
+KEY _field_166 (_field_166)
+);
+INSERT INTO t7 VALUES (1,0,'High',1);
+INSERT INTO t7 VALUES (2,0,'Medium',2);
+INSERT INTO t7 VALUES (3,0,'Low',3);
+select replace(t3._field_140, "\r","^M"),t3_id,min(t3._field_131), min(t3._field_135), min(t3._field_139), min(t3._field_137), min(link_alias_142._field_165), min(link_alias_133._field_72), min(t3._field_145), min(link_alias_148._field_156), replace(min(t3._field_140), "\r","^M"),t3.t3_id from t3 left join t4 on t4.seq_0_id = t3.t3_id left join t7 link_alias_142 on t4.seq_1_id = link_alias_142.t7_id left join t6 on t6.seq_0_id = t3.t3_id left join t1 link_alias_133 on t6.seq_1_id = link_alias_133.t1_id left join t2 on t2.seq_0_id = t3.t3_id left join t5 link_alias_148 on t2.seq_1_id = link_alias_148.t5_id where t3.t3_id in (1) group by t3.t3_id order by link_alias_142._field_166, _field_139, link_alias_133._field_72, _field_135, link_alias_148._field_156;
+replace(t3._field_140, "\r","^M")	t3_id	min(t3._field_131)	min(t3._field_135)	min(t3._field_139)	min(t3._field_137)	min(link_alias_142._field_165)	min(link_alias_133._field_72)	min(t3._field_145)	min(link_alias_148._field_156)	replace(min(t3._field_140), "\r","^M")	t3_id
+test^M
+job^M
+1	1	test job 1	0000-00-00 00:00:00	1999-02-25 22:43:32	0	High	admin	0	tomato	test^M
+job^M
+1	1
+drop table t1,t2,t3,t4,t5,t6,t7;
+create table t1 (a blob);
+insert into t1 values ("empty"),("");
+select a,reverse(a) from t1;
+a	reverse(a)
+empty	ytpme
+	
+drop table t1;
+create table t1 (id integer auto_increment unique,imagem LONGBLOB not null default '');
+Warnings:
+Warning	1101	BLOB/TEXT column 'imagem' can't have a default value
+insert into t1 (id) values (1);
+select
+charset(load_file('../../std_data/words.dat')),
+collation(load_file('../../std_data/words.dat')),
+coercibility(load_file('../../std_data/words.dat'));
+charset(load_file('../../std_data/words.dat'))	collation(load_file('../../std_data/words.dat'))	coercibility(load_file('../../std_data/words.dat'))
+binary	binary	4
+explain extended select
+charset(load_file('MYSQLTEST_VARDIR/std_data/words.dat')),
+collation(load_file('MYSQLTEST_VARDIR/std_data/words.dat')),
+coercibility(load_file('MYSQLTEST_VARDIR/std_data/words.dat'));
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+Warnings:
+Note	1003	/* select#1 */ select charset(load_file('MYSQLTEST_VARDIR/std_data/words.dat')) AS `charset(load_file('MYSQLTEST_VARDIR/std_data/words.dat'))`,collation(load_file('MYSQLTEST_VARDIR/std_data/words.dat')) AS `collation(load_file('MYSQLTEST_VARDIR/std_data/words.dat'))`,coercibility(load_file('MYSQLTEST_VARDIR/std_data/words.dat')) AS `coercibility(load_file('MYSQLTEST_VARDIR/std_data/words.dat'))`
+update t1 set imagem=load_file('MYSQLTEST_VARDIR/std_data/words.dat') where id=1;
+select if(imagem is null, "ERROR", "OK"),length(imagem) from t1 where id = 1;
+if(imagem is null, "ERROR", "OK")	length(imagem)
+OK	581
+drop table t1;
+create table t1 select load_file('MYSQLTEST_VARDIR/std_data/words.dat') l;
+show full fields from t1;
+Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
+l	longblob	NULL	YES		NULL		#	
+drop table t1;
+create table t1 (id integer primary key auto_increment, txt text not null);
+insert into t1 (txt) values ('Chevy ');
+select * from t1 where txt='Chevy';
+id	txt
+1	Chevy 
+select * from t1 where txt='Chevy ';
+id	txt
+1	Chevy 
+select * from t1 where txt='Chevy ' or txt='Chevy';
+id	txt
+1	Chevy 
+select * from t1 where txt='Chevy' or txt='Chevy ';
+id	txt
+1	Chevy 
+select * from t1 where id='1' or id='2';
+id	txt
+1	Chevy 
+insert into t1 (txt) values('Ford');
+select * from t1 where txt='Chevy' or txt='Chevy ' or txt='Ford';
+id	txt
+1	Chevy 
+2	Ford
+select * from t1 where txt='Chevy' or txt='Chevy ';
+id	txt
+1	Chevy 
+select * from t1 where txt='Chevy' or txt='Chevy ' or txt=' Chevy';
+id	txt
+1	Chevy 
+select * from t1 where txt in ('Chevy ','Chevy');
+id	txt
+1	Chevy 
+select * from t1 where txt in ('Chevy');
+id	txt
+1	Chevy 
+select * from t1 where txt between 'Chevy' and 'Chevy';
+id	txt
+1	Chevy 
+select * from t1 where txt between 'Chevy' and 'Chevy' or txt='Chevy ';
+id	txt
+1	Chevy 
+select * from t1 where txt between 'Chevy' and 'Chevy ';
+id	txt
+1	Chevy 
+select * from t1 where txt < 'Chevy ';
+id	txt
+select * from t1 where txt <= 'Chevy';
+id	txt
+1	Chevy 
+select * from t1 where txt > 'Chevy';
+id	txt
+2	Ford
+select * from t1 where txt >= 'Chevy';
+id	txt
+1	Chevy 
+2	Ford
+drop table t1;
+create table t1 (id integer primary key auto_increment, txt text);
+insert into t1 (txt) values ('Chevy'), ('Chevy '), (NULL);
+select * from t1 where txt='Chevy' or txt is NULL;
+id	txt
+1	Chevy
+2	Chevy 
+3	NULL
+explain select * from t1 where txt='Chevy' or txt is NULL;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using where
+select * from t1 where txt='Chevy ';
+id	txt
+1	Chevy
+2	Chevy 
+select * from t1 where txt='Chevy ' or txt='Chevy';
+id	txt
+1	Chevy
+2	Chevy 
+select * from t1 where txt='Chevy' or txt='Chevy ';
+id	txt
+1	Chevy
+2	Chevy 
+select * from t1 where id='1' or id='2';
+id	txt
+1	Chevy
+2	Chevy 
+insert into t1 (txt) values('Ford');
+select * from t1 where txt='Chevy' or txt='Chevy ' or txt='Ford';
+id	txt
+1	Chevy
+2	Chevy 
+4	Ford
+select * from t1 where txt='Chevy' or txt='Chevy ';
+id	txt
+1	Chevy
+2	Chevy 
+select * from t1 where txt='Chevy' or txt='Chevy ' or txt=' Chevy';
+id	txt
+1	Chevy
+2	Chevy 
+select * from t1 where txt in ('Chevy ','Chevy');
+id	txt
+1	Chevy
+2	Chevy 
+select * from t1 where txt in ('Chevy');
+id	txt
+1	Chevy
+2	Chevy 
+select * from t1 where txt between 'Chevy' and 'Chevy';
+id	txt
+1	Chevy
+2	Chevy 
+select * from t1 where txt between 'Chevy' and 'Chevy' or txt='Chevy ';
+id	txt
+1	Chevy
+2	Chevy 
+select * from t1 where txt between 'Chevy' and 'Chevy ';
+id	txt
+1	Chevy
+2	Chevy 
+select * from t1 where txt < 'Chevy ';
+id	txt
+select * from t1 where txt < 'Chevy ' or txt is NULL;
+id	txt
+3	NULL
+select * from t1 where txt <= 'Chevy';
+id	txt
+1	Chevy
+2	Chevy 
+select * from t1 where txt > 'Chevy';
+id	txt
+4	Ford
+select * from t1 where txt >= 'Chevy';
+id	txt
+1	Chevy
+2	Chevy 
+4	Ford
+alter table t1 modify column txt blob;
+explain select * from t1 where txt='Chevy' or txt is NULL;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
+select * from t1 where txt='Chevy' or txt is NULL;
+id	txt
+1	Chevy
+3	NULL
+explain select * from t1 where txt='Chevy' or txt is NULL order by txt;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where; Using filesort
+select * from t1 where txt='Chevy' or txt is NULL order by txt;
+id	txt
+3	NULL
+1	Chevy
+drop table t1;
+CREATE TABLE t1 ( i int(11) NOT NULL default '0',    c text NOT NULL, d varchar(1) NOT NULL DEFAULT ' ', PRIMARY KEY  (i));
+INSERT t1 (i, c) VALUES (1,''),(2,''),(3,'asdfh'),(4,'');
+select max(i) from t1 where c = '';
+max(i)
+4
+drop table t1;
+CREATE table t1 (a blob);
+insert into t1 values ('b'),('a\0'),('a'),('a '),('aa'),(NULL);
+select hex(a) from t1 order by a;
+hex(a)
+NULL
+61
+6100
+6120
+6161
+62
+select hex(concat(a,'\0')) as b from t1 order by concat(a,'\0');
+b
+NULL
+6100
+610000
+612000
+616100
+6200
+alter table t1 modify a varbinary(5);
+select hex(a) from t1 order by a;
+hex(a)
+NULL
+61
+6100
+6120
+6161
+62
+select hex(concat(a,'\0')) as b from t1 order by concat(a,'\0');
+b
+NULL
+6100
+610000
+612000
+616100
+6200
+alter table t1 modify a char(5);
+select hex(a) from t1 order by a;
+hex(a)
+NULL
+6100
+61
+61
+6161
+62
+select hex(concat(a,'\0')) as b from t1 order by concat(a,'\0');
+b
+NULL
+610000
+6100
+6100
+616100
+6200
+alter table t1 modify a binary(5);
+select hex(a) from t1 order by a;
+hex(a)
+NULL
[phone]
[phone]
[phone]
[phone]
[phone]
+select hex(concat(a,'\0')) as b from t1 order by concat(a,'\0');
+b
+NULL
[phone]
[phone]
[phone]
[phone]
[phone]
+drop table t1;
+create table t1 (a text default '');
+Warnings:
+Warning	1101	BLOB/TEXT column 'a' can't have a default value
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` text
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
+insert into t1 values (default);
+select * from t1;
+a
+NULL
+drop table t1;
+set @@sql_mode='TRADITIONAL';
+create table t1 (a text default '');
+ERROR 42000: BLOB/TEXT column 'a' can't have a default value
+set @@sql_mode='';
+CREATE TABLE t (c TEXT CHARSET ASCII);
+INSERT INTO t (c) VALUES (REPEAT('1',65537));
+Warnings:
+Warning	1265	Data truncated for column 'c' at row 1
+INSERT INTO t (c) VALUES (REPEAT('2',65536));
+Warnings:
+Warning	1265	Data truncated for column 'c' at row 1
+INSERT INTO t (c) VALUES (REPEAT('3',65535));
+SELECT LENGTH(c), CHAR_LENGTH(c) FROM t;
+LENGTH(c)	CHAR_LENGTH(c)
[phone]
[phone]
[phone]
+DROP TABLE t;
+drop table if exists b15776;
+create table b15776 (data blob(2147483647));
+drop table b15776;
+create table b15776 (data blob(-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 '-1))' at line 1
+create table b15776 (data blob(2147483648));
+drop table b15776;
+create table b15776 (data blob(4294967294));
+drop table b15776;
+create table b15776 (data blob(4294967295));
+drop table b15776;
+create table b15776 (data blob(4294967296));
+ERROR 42000: Display width out of range for column 'data' (max = 4294967295)
+CREATE TABLE b15776 (a blob(2147483647), b blob(2147483648), c blob(4294967295), a1 text(2147483647), b1 text(2147483648), c1 text(4294967295) );
+show columns from b15776;
+Field	Type	Null	Key	Default	Extra
+a	longblob	YES		NULL	
+b	longblob	YES		NULL	
+c	longblob	YES		NULL	
+a1	longtext	YES		NULL	
+b1	longtext	YES		NULL	
+c1	longtext	YES		NULL	
+drop table b15776;
+CREATE TABLE b15776 (a blob(4294967296));
+ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+CREATE TABLE b15776 (a text(4294967296));
+ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+CREATE TABLE b15776 (a blob(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
+ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+CREATE TABLE b15776 (a text(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
+ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+CREATE TABLE b15776 (a int(0));
+INSERT INTO b15776 values (NULL), (1), (42), (654);
+SELECT * from b15776 ORDER BY a;
+a
+NULL
+1
+42
+654
+DROP TABLE b15776;
+CREATE TABLE b15776 (a int(-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 '-1))' at line 1
+CREATE TABLE b15776 (a int(255));
+DROP TABLE b15776;
+CREATE TABLE b15776 (a int(256));
+ERROR 42000: Display width out of range for column 'a' (max = 255)
+CREATE TABLE b15776 (data blob(-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 '-1))' at line 1
+CREATE TABLE b15776 (a char(2147483647));
+ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead
+CREATE TABLE b15776 (a char(2147483648));
+ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead
+CREATE TABLE b15776 (a char(4294967295));
+ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead
+CREATE TABLE b15776 (a char(4294967296));
+ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+CREATE TABLE b15776 (a year(4));
+INSERT INTO b15776 VALUES (42);
+SELECT * FROM b15776;
+a
+2042
+DROP TABLE b15776;
+CREATE TABLE b15776 (a year(4294967296));
+ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+CREATE TABLE b15776 (a year(-2));
+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 '-2))' at line 1
+CREATE TABLE b15776 (a int(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
+ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+CREATE TABLE b15776 (a char(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
+ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+CREATE TABLE b15776 (a year(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
+ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+CREATE TABLE b15776 select cast(null as char(4294967295));
+show columns from b15776;
+Field	Type	Null	Key	Default	Extra
+cast(null as char(4294967295))	char(0)	YES		NULL	
+drop table b15776;
+CREATE TABLE b15776 select cast(null as nchar(4294967295));
+show columns from b15776;
+Field	Type	Null	Key	Default	Extra
+cast(null as nchar(4294967295))	char(0)	YES		NULL	
+drop table b15776;
+CREATE TABLE b15776 select cast(null as binary(4294967295));
+show columns from b15776;
+Field	Type	Null	Key	Default	Extra
+cast(null as binary(4294967295))	binary(0)	YES		NULL	
+drop table b15776;
+explain select cast(1 as char(4294967295));
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+explain select cast(1 as nchar(4294967295));
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+explain select cast(1 as binary(4294967295));
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+explain select cast(1 as char(4294967296));
+ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
+explain select cast(1 as nchar(4294967296));
+ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
+explain select cast(1 as binary(4294967296));
+ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
+explain select cast(1 as decimal(-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 '-1))' at line 1
+explain select cast(1 as decimal(64, 30));
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+explain select cast(1 as decimal(64, 999999999999999999999999999999));
+Got one of the listed errors
+explain select cast(1 as decimal(4294967296));
+Got one of the listed errors
+explain select cast(1 as decimal(999999999999999999999999999999999999));
+Got one of the listed errors
+explain select convert(1, char(4294967295));
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+explain select convert(1, char(4294967296));
+ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
+explain select convert(1, char(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
+ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
+explain select convert(1, nchar(4294967295));
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+explain select convert(1, nchar(4294967296));
+ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
+explain select convert(1, nchar(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
+ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
+explain select convert(1, binary(4294967295));
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+explain select convert(1, binary(4294967296));
+ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
+explain select convert(1, binary(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
+ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
+End of 5.0 tests
+CREATE TABLE t1(id INT NOT NULL);
+CREATE TABLE t2(id INT NOT NULL, c TEXT NOT NULL);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (1, '');
+UPDATE t2 SET c = REPEAT('1', 70000);
+Warnings:
+Warning	1265	Data truncated for column 'c' at row 1
+SELECT LENGTH(c) FROM t2;
+LENGTH(c)
+65535
+UPDATE t1 LEFT JOIN t2 USING(id) SET t2.c = REPEAT('1', 70000) WHERE t1.id = 1;
+Warnings:
+Warning	1265	Data truncated for column 'c' at row 1
+SELECT LENGTH(c) FROM t2;
+LENGTH(c)
+65535
+DROP TABLE t1, t2;
+# Bug #52160: crash and inconsistent results when grouping
+#             by a function and column
+CREATE FUNCTION f1() RETURNS TINYBLOB RETURN 1;
+CREATE TABLE t1(a CHAR(1));
+INSERT INTO t1 VALUES ('0'), ('0');
+SELECT COUNT(*) FROM t1 GROUP BY f1(), a;
+COUNT(*)
+2
+DROP FUNCTION f1;
+DROP TABLE t1;
+SET @old_max_heap_table_size = @@global.max_heap_table_size;
+SET @old_max_allowed_packet = @@global.max_allowed_packet;
+SET GLOBAL max_heap_table_size = 18 * 1024 * 1024;
+SET GLOBAL max_allowed_packet = 24 * 1024 * 1024;
+drop table if exists t1;
+CREATE TABLE t1 (data LONGBLOB);
+INSERT INTO t1 (data) VALUES (NULL);
+UPDATE t1 set data=repeat('a',18*1024*1024);
+select length(data) from t1;
+length(data)
[phone]
+delete from t1 where left(data,1)='a';
+truncate table t1;
+INSERT INTO t1 (data) VALUES (repeat('a',1*1024*1024));
+INSERT INTO t1 (data) VALUES (repeat('b',16*1024*1024-1024));
+delete from t1 where left(data,1)='b';
+UPDATE t1 set data=repeat('c',17*1024*1024);
+delete from t1 where left(data,1)='c';
+INSERT INTO t1 set data=repeat('a',18*1024*1024);
+select length(data) from t1;
+length(data)
[phone]
+alter table t1 modify data blob;
+select length(data) from t1;
+length(data)
+0
+drop table t1;
+CREATE TABLE t1 (data BLOB);
+INSERT INTO t1 (data) VALUES (NULL);
+UPDATE t1 set data=repeat('a',18*1024*1024);
+Warnings:
+Warning	1265	Data truncated for column 'data' at row 1
+select length(data) from t1;
+length(data)
+65535
+drop table t1;
+SET GLOBAL max_allowed_packet = @old_max_allowed_packet;
+SET GLOBAL max_heap_table_size = @old_max_heap_table_size;
+SET default_storage_engine=@old_default_storage_engine;
 
=== added file 'Percona-Server/mysql-test/r/percona_heap_bug783366.result'
--- Percona-Server/mysql-test/r/percona_heap_bug783366.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_heap_bug783366.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,14 @@
+drop table if exists t1;
+CREATE TABLE t1 (
+f1 VARCHAR ( 128 ) ,
+f2 VARCHAR ( 32 ),
+PRIMARY KEY ( f2 ( 2 ) , f1 )
+)
+ENGINE=HEAP KEY_BLOCK_SIZE = 512;
+INSERT IGNORE INTO t1 VALUES ( 'te' , 'm') , ( NULL , 'think' );
+Warnings:
+Warning	1048	Column 'f1' cannot be null
+INSERT IGNORE INTO t1 VALUES ( 'te' , 'm') , ( NULL , 'think' );
+Warnings:
+Warning	1048	Column 'f1' cannot be null
+DROP TABLE t1;
 
=== added file 'Percona-Server/mysql-test/r/percona_heap_bug783451.result'
--- Percona-Server/mysql-test/r/percona_heap_bug783451.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_heap_bug783451.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,124 @@
+DROP TABLE IF EXISTS local_1_1;
+CREATE  TABLE IF NOT EXISTS local_1_1 ( f1 VARCHAR ( 32 ) NOT NULL  , f2 VARCHAR ( 128 ) NOT NULL DEFAULT 'cboepfaobilcchabvglgjdbynog' , f3 VARCHAR ( 32 ) NOT NULL  , f4 VARBINARY ( 32 ) NOT NULL  , f5 VARBINARY ( 1024 )  DEFAULT 'ycboepfao' , KEY ( f1 /* ( 2 ) */ , f2 /* ( 2 ) */ ) ) ENGINE=HEAP KEY_BLOCK_SIZE = 512;
+INSERT IGNORE INTO local_1_1 VALUES ( REPEAT( 'ervydbimvmbqmsowdbsa' , 1 ) , 'v' , NULL , NULL , REPEAT( 'mervydbimvmbqms' , 5 ) ) , ( 'p' , 6 , 'n' , REPEAT( 'imervydbimvmbqmsowdbs' , 4 ) , 'do' ) , ( NULL , NULL , REPEAT( 'himervydbimvmbqmsowdbsaybudvwaamvhempuublmia' , 6 ) , REPEAT('X', POW(2, 20) * 2) , REPEAT('X', POW(2, 20) * 2) ) , ( REPEAT('X', POW(2, 20) * 2) , REPEAT( 'Y' , 763 ) , NULL , REPEAT('X', POW(2, 20) * 2) , NULL ) , ( REPEAT('X', POW(2, 20) * 2) , 'time' , 'how' , 2 , REPEAT( 'Y' , 107 ) ) , ( REPEAT( 'hyshimervydbimvmbqmsowdbsaybud' , 5 ) , 2 , 8 , NULL , REPEAT('X', POW(2, 20) * 2) ) , ( 'come' , NULL , 'i' , NULL , REPEAT('X', POW(2, 20) * 2) );
+Warnings:
+Warning	1048	Column 'f3' cannot be null
+Warning	1048	Column 'f4' cannot be null
+Warning	1265	Data truncated for column 'f4' at row 2
+Warning	1048	Column 'f1' cannot be null
+Warning	1048	Column 'f2' cannot be null
+Warning	1265	Data truncated for column 'f3' at row 3
+Warning	1265	Data truncated for column 'f4' at row 3
+Warning	1265	Data truncated for column 'f5' at row 3
+Warning	1265	Data truncated for column 'f1' at row 4
+Warning	1265	Data truncated for column 'f2' at row 4
+Warning	1048	Column 'f3' cannot be null
+Warning	1265	Data truncated for column 'f4' at row 4
+Warning	1265	Data truncated for column 'f1' at row 5
+Warning	1265	Data truncated for column 'f1' at row 6
+Warning	1048	Column 'f4' cannot be null
+Warning	1265	Data truncated for column 'f5' at row 6
+Warning	1048	Column 'f2' cannot be null
+Warning	1048	Column 'f4' cannot be null
+Warning	1265	Data truncated for column 'f5' at row 7
+INSERT IGNORE INTO local_1_1 VALUES ( 'ok' , NULL , REPEAT( 'Y' , 651 ) , 2 , 5 ) , ( REPEAT( 'zylcdzkfrqpihyshimervydbimvmbqmsowdbsaybu' , 3 ) , REPEAT( 'Y' , 282 ) , REPEAT( 'X' , 0 ) , REPEAT( 'Y' , 369 ) , 'g' ) , ( 'think' , REPEAT('X', POW(2, 20) * 2), NULL , NULL , REPEAT('X', POW(2, 20) * 2) ) , ( REPEAT( 'Y' , 468 ) , REPEAT( 'dfvbrzylcd' , 6 ) , REPEAT( 'Y' , 264 ) , NULL , 'c' ) , ( NULL , NULL , REPEAT( 'srdfvbrzylcdzkfrqpihyshimervydbimvmbqms' , 0 ) , REPEAT( 'Y' , 244 ) , 7 ) , ( REPEAT( 'Y' , 0 ) , 'how' , 'going' , 'q' , NULL );
+Warnings:
+Warning	1048	Column 'f2' cannot be null
+Warning	1265	Data truncated for column 'f3' at row 1
+Warning	1265	Data truncated for column 'f1' at row 2
+Warning	1265	Data truncated for column 'f2' at row 2
+Warning	1265	Data truncated for column 'f4' at row 2
+Warning	1265	Data truncated for column 'f2' at row 3
+Warning	1048	Column 'f3' cannot be null
+Warning	1048	Column 'f4' cannot be null
+Warning	1265	Data truncated for column 'f5' at row 3
+Warning	1265	Data truncated for column 'f1' at row 4
+Warning	1265	Data truncated for column 'f3' at row 4
+Warning	1048	Column 'f4' cannot be null
+Warning	1048	Column 'f1' cannot be null
+Warning	1048	Column 'f2' cannot be null
+Warning	1265	Data truncated for column 'f4' at row 5
+INSERT IGNORE INTO local_1_1 VALUES ( REPEAT('X', POW(2, 20) * 2) , NULL , NULL , NULL , REPEAT('X', POW(2, 20) * 2) ) , ( REPEAT('X', POW(2, 20) * 2) , NULL , REPEAT('X', POW(2, 20) * 2) , 'this' , 'e' ) , ( NULL , 'think' , NULL , 'were' , NULL ) , ( 9 , 'l' , 'c' , 3 , REPEAT( 'geysrdfvbrzylcdzkfrqpihyshimervydbi' , 5 ) ) , ( NULL , NULL , NULL , 'h' , 'w' );
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
+Warning	1048	Column 'f2' cannot be null
+Warning	1048	Column 'f3' cannot be null
+Warning	1048	Column 'f4' cannot be null
+Warning	1265	Data truncated for column 'f5' at row 1
+Warning	1265	Data truncated for column 'f1' at row 2
+Warning	1048	Column 'f2' cannot be null
+Warning	1265	Data truncated for column 'f3' at row 2
+Warning	1048	Column 'f1' cannot be null
+Warning	1048	Column 'f3' cannot be null
+Warning	1048	Column 'f1' cannot be null
+Warning	1048	Column 'f2' cannot be null
+Warning	1048	Column 'f3' cannot be null
+INSERT IGNORE INTO local_1_1 SELECT * FROM local_1_1;
+INSERT IGNORE INTO local_1_1 SELECT * FROM local_1_1;
+UPDATE local_1_1 SET f5 = REPEAT ('X', 215566);
+Warnings:
+Warning	1265	Data truncated for column 'f5' at row 1
+Warning	1265	Data truncated for column 'f5' at row 2
+Warning	1265	Data truncated for column 'f5' at row 3
+Warning	1265	Data truncated for column 'f5' at row 4
+Warning	1265	Data truncated for column 'f5' at row 5
+Warning	1265	Data truncated for column 'f5' at row 6
+Warning	1265	Data truncated for column 'f5' at row 7
+Warning	1265	Data truncated for column 'f5' at row 8
+Warning	1265	Data truncated for column 'f5' at row 9
+Warning	1265	Data truncated for column 'f5' at row 10
+Warning	1265	Data truncated for column 'f5' at row 11
+Warning	1265	Data truncated for column 'f5' at row 12
+Warning	1265	Data truncated for column 'f5' at row 13
+Warning	1265	Data truncated for column 'f5' at row 14
+Warning	1265	Data truncated for column 'f5' at row 15
+Warning	1265	Data truncated for column 'f5' at row 16
+Warning	1265	Data truncated for column 'f5' at row 17
+Warning	1265	Data truncated for column 'f5' at row 18
+Warning	1265	Data truncated for column 'f5' at row 19
+Warning	1265	Data truncated for column 'f5' at row 20
+Warning	1265	Data truncated for column 'f5' at row 21
+Warning	1265	Data truncated for column 'f5' at row 22
+Warning	1265	Data truncated for column 'f5' at row 23
+Warning	1265	Data truncated for column 'f5' at row 24
+Warning	1265	Data truncated for column 'f5' at row 25
+Warning	1265	Data truncated for column 'f5' at row 26
+Warning	1265	Data truncated for column 'f5' at row 27
+Warning	1265	Data truncated for column 'f5' at row 28
+Warning	1265	Data truncated for column 'f5' at row 29
+Warning	1265	Data truncated for column 'f5' at row 30
+Warning	1265	Data truncated for column 'f5' at row 31
+Warning	1265	Data truncated for column 'f5' at row 32
+Warning	1265	Data truncated for column 'f5' at row 33
+Warning	1265	Data truncated for column 'f5' at row 34
+Warning	1265	Data truncated for column 'f5' at row 35
+Warning	1265	Data truncated for column 'f5' at row 36
+Warning	1265	Data truncated for column 'f5' at row 37
+Warning	1265	Data truncated for column 'f5' at row 38
+Warning	1265	Data truncated for column 'f5' at row 39
+Warning	1265	Data truncated for column 'f5' at row 40
+Warning	1265	Data truncated for column 'f5' at row 41
+Warning	1265	Data truncated for column 'f5' at row 42
+Warning	1265	Data truncated for column 'f5' at row 43
+Warning	1265	Data truncated for column 'f5' at row 44
+Warning	1265	Data truncated for column 'f5' at row 45
+Warning	1265	Data truncated for column 'f5' at row 46
+Warning	1265	Data truncated for column 'f5' at row 47
+Warning	1265	Data truncated for column 'f5' at row 48
+Warning	1265	Data truncated for column 'f5' at row 49
+Warning	1265	Data truncated for column 'f5' at row 50
+Warning	1265	Data truncated for column 'f5' at row 51
+Warning	1265	Data truncated for column 'f5' at row 52
+Warning	1265	Data truncated for column 'f5' at row 53
+Warning	1265	Data truncated for column 'f5' at row 54
+Warning	1265	Data truncated for column 'f5' at row 55
+Warning	1265	Data truncated for column 'f5' at row 56
+Warning	1265	Data truncated for column 'f5' at row 57
+Warning	1265	Data truncated for column 'f5' at row 58
+Warning	1265	Data truncated for column 'f5' at row 59
+Warning	1265	Data truncated for column 'f5' at row 60
+Warning	1265	Data truncated for column 'f5' at row 61
+Warning	1265	Data truncated for column 'f5' at row 62
+Warning	1265	Data truncated for column 'f5' at row 63
+Warning	1265	Data truncated for column 'f5' at row 64
+DROP TABLE local_1_1;
 
=== added file 'Percona-Server/mysql-test/r/percona_heap_bug784464.result'
--- Percona-Server/mysql-test/r/percona_heap_bug784464.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_heap_bug784464.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,58 @@
+CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(32), f3 VARCHAR(32), f4 VARCHAR(32),
+PRIMARY KEY (f1)) ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC	
+DROP TABLE t1;
+CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(32), f3 VARCHAR(32), f4 VARCHAR(32),
+PRIMARY KEY (f1)) KEY_BLOCK_SIZE=33 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+ERROR 42000: Incorrect usage/placement of 'key_block_size'
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(32), f3 VARCHAR(32), f4 VARCHAR(32),
+PRIMARY KEY (f1)) KEY_BLOCK_SIZE=34 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=34	
+DROP TABLE t1;
+CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(32), f3 VARCHAR(32), f4 VARCHAR(32),
+PRIMARY KEY (f1)) KEY_BLOCK_SIZE=123 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=123	
+DROP TABLE t1;
+CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(32), f3 VARCHAR(32), f4 VARCHAR(32),
+PRIMARY KEY (f1)) KEY_BLOCK_SIZE=1000 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=1000	
+DROP TABLE t1;
+CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
+PRIMARY KEY (f1)) ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC	
+DROP TABLE t1;
+CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
+PRIMARY KEY (f1)) KEY_BLOCK_SIZE=33 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+ERROR 42000: Incorrect usage/placement of 'key_block_size'
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
+PRIMARY KEY (f1)) KEY_BLOCK_SIZE=34 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=34	
+DROP TABLE t1;
+CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
+PRIMARY KEY (f1)) KEY_BLOCK_SIZE=121 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=121	
+DROP TABLE t1;
+CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
+PRIMARY KEY (f1)) KEY_BLOCK_SIZE=1000 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=1000	
+DROP TABLE t1;
 
=== added file 'Percona-Server/mysql-test/r/percona_heap_bug784464_32bit.result'
--- Percona-Server/mysql-test/r/percona_heap_bug784464_32bit.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_heap_bug784464_32bit.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,12 @@
+CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(32), f3 VARCHAR(32), f4 VARCHAR(32),
+PRIMARY KEY (f1)) KEY_BLOCK_SIZE=124 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=124	
+DROP TABLE t1;
+CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
+PRIMARY KEY (f1)) KEY_BLOCK_SIZE=122 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=122	
+DROP TABLE t1;
 
=== added file 'Percona-Server/mysql-test/r/percona_heap_bug784464_64bit.result'
--- Percona-Server/mysql-test/r/percona_heap_bug784464_64bit.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_heap_bug784464_64bit.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,12 @@
+CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(32), f3 VARCHAR(32), f4 VARCHAR(32),
+PRIMARY KEY (f1)) KEY_BLOCK_SIZE=124 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=124	
+DROP TABLE t1;
+CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
+PRIMARY KEY (f1)) KEY_BLOCK_SIZE=122 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=122	
+DROP TABLE t1;
 
=== added file 'Percona-Server/mysql-test/r/percona_heap_bug784468.result'
--- Percona-Server/mysql-test/r/percona_heap_bug784468.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_heap_bug784468.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,15 @@
+CREATE TABLE t1 ( f1 VARCHAR(30)) ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	MEMORY	10	Fixed	0	32	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC	
+DROP TABLE t1;
+CREATE TABLE t1 ( f1 VARCHAR(31)) ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	MEMORY	10	Fixed	0	33	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC	
+DROP TABLE t1;
+CREATE TABLE t1 ( f1 VARCHAR(32)) ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	MEMORY	10	Fixed	0	34	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC	
+DROP TABLE t1;
 
=== added file 'Percona-Server/mysql-test/r/percona_heap_bug788544.result'
--- Percona-Server/mysql-test/r/percona_heap_bug788544.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_heap_bug788544.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,9 @@
+CREATE TABLE t1 (f2 VARCHAR (32), f4 LONGBLOB, f5 TEXT) ENGINE=HEAP;
+INSERT INTO t1 VALUES ('a', NULL, NULL),
+('b' , REPEAT('a' , 593338), REPEAT('a', 800));
+UPDATE t1 SET f2 = 'c' WHERE f4 = 'd';
+SELECT LENGTH(f2), LENGTH(f4), LENGTH(f5) FROM t1;
+LENGTH(f2)	LENGTH(f4)	LENGTH(f5)
+1	NULL	NULL
[phone]
+DROP TABLE t1;
 
=== added file 'Percona-Server/mysql-test/r/percona_heap_bug788576.result'
--- Percona-Server/mysql-test/r/percona_heap_bug788576.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_heap_bug788576.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,19 @@
+CREATE TABLE t1 (f1 VARCHAR (32), f2 VARCHAR (128), f3 VARBINARY (128),
+f4 VARBINARY (512), f5 VARBINARY (1024),
+KEY (f2(1))) ENGINE=HEAP ROW_FORMAT=DYNAMIC;
+INSERT IGNORE INTO t1 VALUES (2, NULL, 6, REPEAT('glugcgqk', 5), 'look'),
+(REPEAT( 'kglugcgqkin', 6), 'if', 'was', NULL, NULL),
+(NULL, NULL, NULL, NULL, 7);
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 2
+SELECT * FROM t1;
+f1	f2	f3	f4	f5
+2	NULL	6	glugcgqkglugcgqkglugcgqkglugcgqkglugcgqk	look
+kglugcgqkinkglugcgqkinkglugcgqki	if	was	NULL	NULL
+NULL	NULL	NULL	NULL	7
+DELETE FROM t1 WHERE f5 <=> NULL;
+SELECT * FROM t1;
+f1	f2	f3	f4	f5
+2	NULL	6	glugcgqkglugcgqkglugcgqkglugcgqkglugcgqk	look
+NULL	NULL	NULL	NULL	7
+DROP TABLE t1;
 
=== added file 'Percona-Server/mysql-test/r/percona_heap_bug788722.result'
--- Percona-Server/mysql-test/r/percona_heap_bug788722.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_heap_bug788722.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,18 @@
+CREATE TABLE IF NOT EXISTS local_1_1 (f1 VARCHAR (32) NOT NULL,
+f2 VARCHAR (128) NOT NULL,
+f3 BLOB NOT NULL,
+f4 TEXT,
+f5 BLOB (1024),
+PRIMARY KEY (f1),
+KEY (f1 , f2)
+) ENGINE=HEAP ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE = 2048;
+INSERT IGNORE INTO local_1_1 VALUES
+(REPEAT('egqeqfxwaejpqixuvvtentruyqadxiybjdfqjspfbyjdjczrrwjnagkzsoagatqookhsgtrvvbxacppljfzaseidqggxvuirm' , 5), NULL, NULL, NULL, REPEAT('hegqeqfxwaejpqixuvvtentruyqadxiy', 1)),
+('you', NULL, 0, REPEAT("X", 2048) , 0);
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
+Warning	1048	Column 'f2' cannot be null
+Warning	1048	Column 'f3' cannot be null
+Warning	1048	Column 'f2' cannot be null
+INSERT IGNORE INTO local_1_1 SELECT * FROM local_1_1;
+DROP TABLE local_1_1;
 
=== added file 'Percona-Server/mysql-test/r/percona_heap_bug789131.result'
--- Percona-Server/mysql-test/r/percona_heap_bug789131.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_heap_bug789131.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,7 @@
+CREATE TABLE t1 (f1 VARCHAR (128), f2 VARCHAR (128), f3 VARBINARY (512),
+f4 TEXT (65525), f5 VARCHAR (128), KEY (f1(1))) ENGINE=HEAP;
+INSERT IGNORE INTO t1 VALUES 
+( 'o' , "" , NULL , "" , 0 ) , 
+(NULL, "" , "" , "" , 'f' ) ;
+INSERT IGNORE INTO t1 SELECT * FROM t1;
+DROP TABLE t1;
 
=== added file 'Percona-Server/mysql-test/r/percona_heap_var.result'
--- Percona-Server/mysql-test/r/percona_heap_var.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_heap_var.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,194 @@
+drop table if exists t1;
+set @@session.max_heap_table_size=16*1024*1024;
+create table t1 (a int not null, b varchar(400), c int, primary key (a), key (c)) engine=heap comment="testing heaps" key_block_size=128;
+ERROR 42000: Incorrect usage/placement of 'key_block_size'
+create table t1 (a int not null, b int, c varchar(400), primary key (a), key (b)) engine=heap comment="testing heaps" key_block_size=4;
+ERROR 42000: Incorrect usage/placement of 'key_block_size'
+create table t1 (a int not null, b int, c varchar(400), d varchar(400), primary key (a), key (b)) engine=heap comment="testing heaps" key_block_size=24;
+show table status like "t1";
+Name	t1
+Engine	MEMORY
+Version	10
+Row_format	Dynamic
+Rows	0
+Avg_row_length	X
+Data_length	X
+Max_data_length	X
+Index_length	X
+Data_free	X
+Auto_increment	X
+Create_time	X
+Update_time	X
+Check_time	X
+Collation	latin1_swedish_ci
+Checksum	NULL
+Create_options	KEY_BLOCK_SIZE=24
+Comment	testing heaps
+insert into t1 values (1,1,'012',NULL), (2,2,'0123456789',NULL), (3,3,'012345678901234567890123456789',NULL), (4,4,NULL,'0123456789012345678901234567890123456789012345678901234567890123456789');
+select * from t1;
+a	b	c	d
+1	1	012	NULL
[phone]	NULL
+3	3	012345678901234567890123456789	NULL
+4	4	NULL	0123456789012345678901234567890123456789012345678901234567890123456789
+delete from t1 where a = 3;
+select * from t1;
+a	b	c	d
+1	1	012	NULL
[phone]	NULL
+4	4	NULL	0123456789012345678901234567890123456789012345678901234567890123456789
+insert into t1 values (5,5,NULL,'0123'), (6,6,NULL,'0123');
+select * from t1;
+a	b	c	d
+1	1	012	NULL
[phone]	NULL
+6	6	NULL	0123
+5	5	NULL	0123
+4	4	NULL	0123456789012345678901234567890123456789012345678901234567890123456789
+update t1 set c = '012345678901234567890123456789' where a = 2;
+select * from t1;
+a	b	c	d
+1	1	012	NULL
+2	2	012345678901234567890123456789	NULL
+6	6	NULL	0123
+5	5	NULL	0123
+4	4	NULL	0123456789012345678901234567890123456789012345678901234567890123456789
+update t1 set c = '0123456789' where a = 2;
+select * from t1;
+a	b	c	d
+1	1	012	NULL
[phone]	NULL
+6	6	NULL	0123
+5	5	NULL	0123
+4	4	NULL	0123456789012345678901234567890123456789012345678901234567890123456789
+insert into t1 values (7,7,'0123',NULL), (8,8,'0123',NULL);
+select * from t1;
+a	b	c	d
+1	1	012	NULL
[phone]	NULL
+6	6	NULL	0123
+5	5	NULL	0123
+4	4	NULL	0123456789012345678901234567890123456789012345678901234567890123456789
+7	7	0123	NULL
+8	8	0123	NULL
+show table status like "t1";
+Name	t1
+Engine	MEMORY
+Version	10
+Row_format	Dynamic
+Rows	7
+Avg_row_length	X
+Data_length	X
+Max_data_length	X
+Index_length	X
+Data_free	X
+Auto_increment	X
+Create_time	X
+Update_time	X
+Check_time	X
+Collation	latin1_swedish_ci
+Checksum	NULL
+Create_options	KEY_BLOCK_SIZE=24
+Comment	testing heaps
+alter table t1 key_block_size = 0;
+show table status like "t1";
+Name	t1
+Engine	MEMORY
+Version	10
+Row_format	Dynamic
+Rows	7
+Avg_row_length	X
+Data_length	X
+Max_data_length	X
+Index_length	X
+Data_free	X
+Auto_increment	X
+Create_time	X
+Update_time	X
+Check_time	X
+Collation	latin1_swedish_ci
+Checksum	NULL
+Create_options	
+Comment	testing heaps
+alter table t1 row_format = dynamic;
+show table status like "t1";
+Name	t1
+Engine	MEMORY
+Version	10
+Row_format	Dynamic
+Rows	7
+Avg_row_length	X
+Data_length	X
+Max_data_length	X
+Index_length	X
+Data_free	X
+Auto_increment	X
+Create_time	X
+Update_time	X
+Check_time	X
+Collation	latin1_swedish_ci
+Checksum	NULL
+Create_options	row_format=DYNAMIC KEY_BLOCK_SIZE=X
+Comment	testing heaps
+alter table t1 key_block_size = 128, max_rows = 10001;
+show table status like "t1";
+Name	t1
+Engine	MEMORY
+Version	10
+Row_format	Dynamic
+Rows	7
+Avg_row_length	X
+Data_length	X
+Max_data_length	X
+Index_length	X
+Data_free	X
+Auto_increment	X
+Create_time	X
+Update_time	X
+Check_time	X
+Collation	latin1_swedish_ci
+Checksum	NULL
+Create_options	max_rows=10001 row_format=DYNAMIC KEY_BLOCK_SIZE=128
+Comment	testing heaps
+select * from t1;
+a	b	c	d
+1	1	012	NULL
[phone]	NULL
+6	6	NULL	0123
+5	5	NULL	0123
+4	4	NULL	0123456789012345678901234567890123456789012345678901234567890123456789
+7	7	0123	NULL
+8	8	0123	NULL
+delete from t1;
+select * from t1;
+a	b	c	d
+call mtr.add_suppression("The table 't1' is full");
+select count(*) from t1;
+count(*)
+10001
+insert into t1 values (100000,100000,NULL,'0123'), (100000,100000,NULL,'0123');
+ERROR HY000: The table 't1' is full
+show table status like "t1";
+Name	t1
+Engine	MEMORY
+Version	10
+Row_format	Dynamic
+Rows	10001
+Avg_row_length	X
+Data_length	X
+Max_data_length	X
+Index_length	X
+Data_free	X
+Auto_increment	X
+Create_time	X
+Update_time	X
+Check_time	X
+Collation	latin1_swedish_ci
+Checksum	NULL
+Create_options	max_rows=10001 row_format=DYNAMIC KEY_BLOCK_SIZE=128
+Comment	testing heaps
+select count(*) from t1;
+count(*)
+10001
+set @@session.max_heap_table_size=default;
+drop table t1;
 
=== added file 'Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result'
--- Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,28 @@
+# Establish connection con1 (user=root)
+# Establish connection con2 (user=root)
+# Establish connection con3 (user=root)
+# Drop test table
+drop table if exists t;
+# Create test table
+create table t(a INT PRIMARY KEY, b INT) engine=InnoDB;
+# Insert two rows to test table
+insert into t values(2,1);
+insert into t values(1,2);
+# Switch to connection con1
+BEGIN;
+SELECT b FROM t WHERE a=1 FOR UPDATE;
+# Switch to connection con2
+BEGIN;
+SELECT b FROM t WHERE a=2 FOR UPDATE;
+# Switch to connection con1
+SELECT b FROM t WHERE a=2 FOR UPDATE;
+# Switch to connection con2
+SELECT b FROM t WHERE a=1 FOR UPDATE;
+# Switch to connection con1
+ROLLBACK;
+# Switch to connection con2
+ROLLBACK;
+# Switch to connection con3
+Deadlocks: 1
+# Drop test table
+drop table t;
 
=== added file 'Percona-Server/mysql-test/r/percona_innodb_fake_changes.result'
--- Percona-Server/mysql-test/r/percona_innodb_fake_changes.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_fake_changes.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,119 @@
+DROP TABLE IF EXISTS t1, t2, t3;
+# Checking variables
+SHOW VARIABLES LIKE 'innodb_fake_changes';
+Variable_name	Value
+innodb_fake_changes	OFF
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes';
+VARIABLE_VALUE
+OFF
+SET innodb_fake_changes=1;
+SHOW VARIABLES LIKE 'innodb_fake_changes';
+Variable_name	Value
+innodb_fake_changes	ON
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes';
+VARIABLE_VALUE
+ON
+SET innodb_fake_changes=default;
+SHOW VARIABLES LIKE 'innodb_fake_changes';
+Variable_name	Value
+innodb_fake_changes	OFF
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes';
+VARIABLE_VALUE
+OFF
+# Explicit COMMIT should fail when innodb_fake_changes is enabled
+# DML should be fine
+SET @@GLOBAL.userstat= TRUE;
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+SET autocommit=0;
+SET innodb_fake_changes=1;
+BEGIN;
+INSERT INTO t1 VALUES (2);
+UPDATE t1 SET a=0;
+DELETE FROM t1 LIMIT 1;
+SELECT * FROM t1;
+a
+1
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+SET innodb_fake_changes=default;
+# Verify that the fake changes to t1 did not leak through
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+should_be_1
+1
+should_be_0
+0
+should_be_0
+0
+should_be_0
+0
+should_be_0
+0
+should_be_0
+0
+should_be_0
+0
+should_be_0
+0
+DROP TABLE t1;
+# DDL must result in error
+CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
+SET autocommit=0;
+SET innodb_fake_changes=1;
+BEGIN;
+CREATE TABLE t2 (a INT) ENGINE=InnoDB;
+ERROR HY000: Table storage engine for 't2' doesn't have this option
+DROP TABLE t1;
+ERROR 42S02: Unknown table 'test.t1'
+TRUNCATE TABLE t1;
+ERROR HY000: Got error 131 during COMMIT
+ALTER TABLE t1 ENGINE=MyISAM;
+ERROR HY000: Got error 131 during COMMIT
+ROLLBACK;
+SET innodb_fake_changes=0;
+INSERT INTO t1 VALUES (1), (2);
+COMMIT;
+CREATE TABLE t2 (a INT PRIMARY KEY, b INT, INDEX b_ind (b),
+FOREIGN KEY (b) REFERENCES t1(a) ON DELETE CASCADE ON UPDATE CASCADE) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (1, 1);
+INSERT INTO t2 VALUES (2, 2);
+COMMIT;
+SET innodb_fake_changes=1;
+DELETE FROM t1 WHERE a=1;
+UPDATE t1 SET a=3 WHERE a=2;
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+should_be_1
+1
+should_be_0
+0
+should_be_0
+0
+should_be_0
+0
+should_be_0
+0
+should_be_0
+0
+should_be_0
+0
+SET innodb_fake_changes=0;
+DROP TABLE t2;
+CREATE TABLE t3 (a INT primary key, b text) ENGINE=InnoDB;
+INSERT INTO t3 VALUES (1,'');
+COMMIT;
+SET innodb_fake_changes=1;
+UPDATE t3 set b=lpad('b',11000,'c') where a=1;
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+SET innodb_fake_changes=default;
+# Verify that the fake changes to t3 did not leak through
+CHECK TABLE t3;
+Table	Op	Msg_type	Msg_text
+test.t3	check	status	OK
+should_be_1
+1
+DROP TABLE t1, t3;
+SET @@GLOBAL.userstat= default;
 
=== added file 'Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_898306.result'
--- Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_898306.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_898306.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,43 @@
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (a INT primary key, b int, unique key (b)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1,1);
+SET autocommit=1;
+SET innodb_fake_changes=1;
+# Confirm that duplicate key errors on REPLACE works
+REPLACE INTO t1 VALUES (1,1);
+ERROR HY000: Got error 131 during COMMIT
+REPLACE INTO t1 VALUES (1,2);
+ERROR HY000: Got error 131 during COMMIT
+# Confirm that duplicate key errors are OK
+BEGIN;
+REPLACE INTO t1 VALUES (1,2);
+SELECT * from t1;
+a	b
+1	1
+REPLACE INTO t1 VALUES (1,1);
+SELECT * from t1;
+a	b
+1	1
+ROLLBACK;
+BEGIN;
+REPLACE INTO t1 VALUES (2,1);
+ERROR 23000: Duplicate entry '1' for key 'b'
+INSERT INTO t1 VALUES (1,1);
+ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
+INSERT INTO t1 VALUES (1,2);
+ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
+INSERT INTO t1 VALUES (2,1);
+ERROR 23000: Duplicate entry '1' for key 'b'
+ROLLBACK;
+INSERT INTO t1 VALUES (1,1) ON DUPLICATE KEY UPDATE b=b+10;
+ERROR HY000: Got error 131 during COMMIT
+INSERT INTO t1 VALUES (1,2) ON DUPLICATE KEY UPDATE b=b+10;
+ERROR HY000: Got error 131 during COMMIT
+SET innodb_fake_changes=0;
+SELECT * from t1;
+a	b
+1	1
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+DROP TABLE t1;
 
=== added file 'Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_917942.result'
--- Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_917942.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_917942.result	2013-05-20 14:30:50 +0000
@@ -0,0 +1,151 @@
+DROP TABLE IF EXISTS t1;
+Test compressed
+CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB KEY_BLOCK_SIZE=8;
+INSERT INTO t1 VALUES(NULL, LPAD("v", 2, "b"), LPAD("a", 100, "b"));
+SET innodb_fake_changes=1;
+INSERT INTO t1 VALUES(1, "foo", LPAD("a", 4600, "b")) ON DUPLICATE KEY UPDATE T = VALUES(T);
+ERROR HY000: Got error 131 during COMMIT
+UPDATE t1 SET T = LPAD("A", 4600, "b");
+ERROR HY000: Got error 131 during COMMIT
+SET innodb_fake_changes=0;
+CHECK TABLE t1;