bzr commit into mysql-trunk-bugfixing branch (alik:3045) Bug#27863

[Alexander Nozdrin]

#At file:///mnt/raid/alik/MySQL/bzr/00/bug27863/mysql-trunk-bf-bug27863/ based on revid:alik@stripped

 3045 Alexander Nozdrin	2010-05-17
      Follow-up patch for Bug#27863 (excessive memory usage for many small queries
      in a multiquery packet): fix NDB test failures.

    modified:
      sql/ha_ndbcluster_binlog.cc
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2010-05-14 18:11:25 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2010-05-17 12:10:26 +0000
@@ -263,7 +263,6 @@ static void run_query(THD *thd, char *bu
   ulonglong save_thd_options= thd->variables.option_bits;
   DBUG_ASSERT(sizeof(save_thd_options) == sizeof(thd->variables.option_bits));
   NET save_thd_net= thd->net;
-  Parser_state parser_state(thd, thd->query(), thd->query_length());
 
   bzero((char*) &thd->net, sizeof(NET));
   thd->set_query(buf, (uint) (end - buf));
@@ -277,7 +276,10 @@ static void run_query(THD *thd, char *bu
   DBUG_ASSERT(!thd->in_sub_stmt);
   DBUG_ASSERT(!thd->locked_tables_mode);
 
-  mysql_parse(thd, thd->query(), thd->query_length(), &parser_state);
+  {
+    Parser_state parser_state(thd, thd->query(), thd->query_length());
+    mysql_parse(thd, thd->query(), thd->query_length(), &parser_state);
+  }
 
   if (no_print_error && thd->is_slave_error)
   {


Attachment: [text/bzr-bundle] bzr/[e-mail]