After merge fixes

d2d7533e · monty@mysql.com · 87af3d91 · d2d7533e
Commit d2d7533e authored Nov 09, 2004 by monty@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_select.cc sql/sql_select.cc +1 -1

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -1876,7 +1876,7 @@ Cursor::fetch(ulong num_rows)
    /* free cursor memory */
    free_items(free_list);
    free_list= 0;
-    free_root(&mem_root, MYF(0));
+    free_root(&main_mem_root, MYF(0));
  }
  return error;
 }