#!!! notice !!!
# Any small change to this file in the main branch
# should be done or reviewed by the maintainer!
-diff -ruN a/sql/sql_base.cc b/sql/sql_base.cc
---- a/sql/sql_base.cc 2011-01-11 21:35:26.000000000 +0300
-+++ b/sql/sql_base.cc 2011-01-11 21:42:02.000000000 +0300
-@@ -251,8 +251,12 @@
+--- a/sql/sql_base.cc
++++ b/sql/sql_base.cc
+@@ -314,8 +314,12 @@
const TABLE_LIST *table_list,
bool tmp_table)
{
if (tmp_table)
{
int4store(key + key_length, thd->server_id);
-diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
---- a/sql/sql_parse.cc 2011-01-11 21:35:26.000000000 +0300
-+++ b/sql/sql_parse.cc 2011-01-11 21:48:50.000000000 +0300
-@@ -1110,11 +1110,18 @@
+--- a/sql/sql_parse.cc
++++ b/sql/sql_parse.cc
+@@ -1116,11 +1116,18 @@
break;
#else
{
/*
SHOW statements should not add the used tables to the list of tables
used in a transaction.
-@@ -1127,24 +1134,23 @@
+@@ -1133,24 +1140,23 @@
/*
We have name + wildcard in packet, separated by endzero
*/
mysql_reset_thd_for_next_command(thd);
lex_start(thd);
/* Must be before we init the table list. */
-@@ -1169,9 +1175,6 @@
+@@ -1175,9 +1181,6 @@
table_list.schema_table= schema_table;
}
thd->set_query(fields, query_length);
general_log_print(thd, command, "%s %s", table_list.table_name, fields);
-diff -ruN a/strings/ctype-utf8.c b/strings/ctype-utf8.c
---- a/strings/ctype-utf8.c 2010-12-03 20:58:26.000000000 +0300
-+++ b/strings/ctype-utf8.c 2011-01-11 21:42:02.000000000 +0300
+--- a/strings/ctype-utf8.c
++++ b/strings/ctype-utf8.c
@@ -4212,6 +4212,10 @@
{
int code;