bzr push into mysql-trunk branch (Dmitry.Lenev:3525 to 3526) Bug#13116518

[Dmitry Lenev]

 3526 Dmitry Lenev	2011-10-24 [merge]
      Merge of fix for bug #13116518 "OPEN_TABLES() SHOULD NOT ALLOCATE
      AND FREE NEW_FRM_MEM WITHOUT NEEDING TO".

    modified:
      sql/sql_base.cc
 3525 Ashish Agarwal	2011-10-22 [merge]
      #BUG#11758979 - 51252: merge from mysql-5.5

    modified:
      mysql-test/r/archive.result
      mysql-test/t/archive.test
      storage/archive/ha_archive.cc
=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2011-10-05 13:16:38 +0000
+++ b/sql/sql_base.cc	2011-10-24 07:49:46 +0000
@@ -4948,10 +4948,11 @@ bool open_tables(THD *thd, TABLE_LIST **
   }
 
   /*
-    temporary mem_root for new .frm parsing.
-    TODO: variables for size
+    Initialize temporary MEM_ROOT for new .FRM parsing. Do not allocate
+    anything yet, to avoid penalty for statements which don't use views
+    and thus new .FRM format.
   */
-  init_sql_alloc(&new_frm_mem, 8024, 8024);
+  init_sql_alloc(&new_frm_mem, 8024, 0);
 
   thd->current_tablenr= 0;
 restart:

No bundle (reason: useless for push emails).