diff options
| author | gluh@mysql.com/eagle.(none) <> | 2007-01-10 14:03:36 +0400 |
|---|---|---|
| committer | gluh@mysql.com/eagle.(none) <> | 2007-01-10 14:03:36 +0400 |
| commit | 4a3fe2b6826749ec3981f5778399a0352390b560 (patch) | |
| tree | 07e0281c1f2926ec4155057cb851d676d9ed08e8 /sql/sql_base.cc | |
| parent | 9da22c73d0a69763f257d0cd339de235ecd8c067 (diff) | |
| download | mariadb-git-4a3fe2b6826749ec3981f5778399a0352390b560.tar.gz | |
after merge fix
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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)) { |