mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed bugs pointed by "Crash with 'big' derivated table in MySQL-4.1" bugreport

Browse source 
- fixed switching from heap to MyISAM table
 - fixed error handler
This commit is contained in:
bell@sanja.is.com.ua 2002-11-16 00:01:48 +02:00
parent 237e2ca001
commit 7f4ee30de1
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sql/sql_derived.cc
View file

@ -88,6 +88,7 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, TABLE_LIST *t)
if ((derived_result=new select_union(table)))
{
derived_result->tmp_table_param=&tmp_table_param;
unit->offset_limit_cnt= sl->offset_limit;
unit->select_limit_cnt= sl->select_limit+sl->offset_limit;
if (unit->select_limit_cnt < sl->select_limit)
@ -128,8 +129,6 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, TABLE_LIST *t)
free_tmp_table(thd,table);
exit:
close_thread_tables(thd);
if (res > 0)
send_error(thd, ER_UNKNOWN_COM_ERROR); // temporary only ...
}
DBUG_RETURN(res);
}

2
sql/sql_parse.cc
View file

@ -1344,7 +1344,7 @@ mysql_execute_command(THD *thd)
cursor->derived,
cursor)))
{
if (res < 0)
if (res < 0 || thd->net.report_error)
send_error(thd,thd->killed ? ER_SERVER_SHUTDOWN : 0);
DBUG_VOID_RETURN;
}

8
sql/sql_union.cc
View file

@ -78,7 +78,13 @@ bool select_union::send_data(List<Item> &values)
fill_record(table->field,values);
if ((write_record(table,&info)))
{
if (create_myisam_from_heap(table, tmp_table_param, info.last_errno, 0))
if (thd->net.last_errno == ER_RECORD_FILE_FULL)
{
thd->clear_error(); // do not report user about table overflow
if (create_myisam_from_heap(table, tmp_table_param, info.last_errno, 0))
return 1;
}
else
return 1;
}
return 0;