mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
after merge fix
This commit is contained in:
@@ -5167,6 +5167,7 @@ my_bool mysql_rm_tmp_tables(void)
|
|||||||
|
|
||||||
if (!(thd= new THD))
|
if (!(thd= new THD))
|
||||||
DBUG_RETURN(1);
|
DBUG_RETURN(1);
|
||||||
|
thd->thread_stack= (char*) &thd;
|
||||||
thd->store_globals();
|
thd->store_globals();
|
||||||
|
|
||||||
for (i=0; i<=mysql_tmpdir_list.max; i++)
|
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))
|
if (!bcmp(reg_ext, ext, ext_len))
|
||||||
{
|
{
|
||||||
TABLE tmp_table;
|
TABLE tmp_table;
|
||||||
if (!openfrm(filePath, "tmp_table", (uint) 0,
|
if (!openfrm(thd, filePath, "tmp_table", (uint) 0,
|
||||||
READ_KEYINFO | COMPUTE_TYPES | EXTRA_RECORD,
|
READ_KEYINFO | COMPUTE_TYPES | EXTRA_RECORD,
|
||||||
0, &tmp_table))
|
0, &tmp_table))
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user