From 53c9b0d07ce85870bfd8654a12b3a1934308fdef Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 10 Jan 2007 14:03:36 +0400 Subject: after merge fix --- sql/sql_base.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql/sql_base.cc') diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 6e93245c95f..5dcd596f6c2 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5167,6 +5167,7 @@ my_bool mysql_rm_tmp_tables(void) if (!(thd= new THD)) DBUG_RETURN(1); + thd->thread_stack= (char*) &thd; thd->store_globals(); for (i=0; i<=mysql_tmpdir_list.max; i++) @@ -5196,7 +5197,7 @@ my_bool mysql_rm_tmp_tables(void) if (!bcmp(reg_ext, ext, ext_len)) { TABLE tmp_table; - if (!openfrm(filePath, "tmp_table", (uint) 0, + if (!openfrm(thd, filePath, "tmp_table", (uint) 0, READ_KEYINFO | COMPUTE_TYPES | EXTRA_RECORD, 0, &tmp_table)) { -- cgit v1.2.1