- up to 5.5.17

[packages/mysql.git] / bug580324.patch

diff --git a/bug580324.patch b/bug580324.patch
index ae154782371c5504bf844e35e2aebb4fc98d9479..5904490fae9c8804c332a60fc6ffaccbc2f80ee4 100644 (file)
--- a/bug580324.patch
+++ b/bug580324.patch
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/sql/sql_base.cc
 +++ b/sql/sql_base.cc
-@@ -251,8 +251,12 @@
+@@ -314,8 +314,12 @@
                            const TABLE_LIST *table_list,
                            bool tmp_table)
  {
@@ -24,7 +24,7 @@
      int4store(key + key_length, thd->server_id);
 --- a/sql/sql_parse.cc
 +++ b/sql/sql_parse.cc
-@@ -1112,11 +1112,18 @@
+@@ -1113,11 +1113,18 @@
      break;
  #else
    {
@@ -44,7 +44,7 @@
      /*
        SHOW statements should not add the used tables to the list of tables
        used in a transaction.
-@@ -1129,24 +1136,23 @@
+@@ -1130,24 +1137,23 @@
      /*
        We have name + wildcard in packet, separated by endzero
      */
@@ -81,7 +81,7 @@
      mysql_reset_thd_for_next_command(thd);
      lex_start(thd);
      /* Must be before we init the table list. */
-@@ -1171,9 +1177,6 @@
+@@ -1172,9 +1178,6 @@
          table_list.schema_table= schema_table;
      }