- rel 2; patches updated

[packages/mysql.git] / bug580324.patch

diff --git a/bug580324.patch b/bug580324.patch
index 8d9db2711277d2006a86e6bcc99100b8621308c4..f8f5bc38c30c03e96eb6716a4d77f20fae449ac9 100644 (file)
--- a/bug580324.patch
+++ b/bug580324.patch
@@ -5,10 +5,9 @@
 #!!! 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-04-09 18:49:00.000000000 +0400
-+++ b/sql/sql_base.cc  2011-04-09 18:49:02.000000000 +0400
-@@ -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)
  {
@@ -23,10 +22,9 @@ diff -ruN a/sql/sql_base.cc b/sql/sql_base.cc
    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-04-09 18:49:00.000000000 +0400
-+++ b/sql/sql_parse.cc 2011-04-09 18:49:02.000000000 +0400
-@@ -1112,11 +1112,18 @@
+--- a/sql/sql_parse.cc
++++ b/sql/sql_parse.cc
+@@ -1116,11 +1116,18 @@
      break;
  #else
    {
@@ -46,7 +44,7 @@ diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
      /*
        SHOW statements should not add the used tables to the list of tables
        used in a transaction.
-@@ -1129,24 +1136,23 @@
+@@ -1133,24 +1140,23 @@
      /*
        We have name + wildcard in packet, separated by endzero
      */
@@ -83,7 +81,7 @@ diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
      mysql_reset_thd_for_next_command(thd);
      lex_start(thd);
      /* Must be before we init the table list. */
-@@ -1171,9 +1177,6 @@
+@@ -1175,9 +1181,6 @@
          table_list.schema_table= schema_table;
      }
  
@@ -93,9 +91,8 @@ diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
      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     2011-04-09 18:48:03.000000000 +0400
-+++ b/strings/ctype-utf8.c     2011-04-09 18:49:02.000000000 +0400
+--- a/strings/ctype-utf8.c
++++ b/strings/ctype-utf8.c
 @@ -4212,6 +4212,10 @@
  {
    int code;