database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0

Browse Source 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
msvensson@shellback.(none)
2006-04-27 17:35:29 +02:00
parent 46ee4ea0df 0e5113aead
commit e5004d1312
146 changed files with 10986 additions and 1471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_base.cc
View File

@ -1187,7 +1187,7 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
/* an open table operation needs a lot of the stack space */
if (check_stack_overrun(thd, STACK_MIN_SIZE_FOR_OPEN, (char *)&alias))
return 0;
DBUG_RETURN(0);
if (thd->killed)
DBUG_RETURN(0);