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 tulin@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1


sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
This commit is contained in:
unknown
2005-05-31 21:30:26 +02:00
parent fc2e19823f 3f7b0f708e
commit 23f261ef04
19 changed files with 320 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/table.cc
View File

@ -1818,7 +1818,7 @@ bool st_table_list::setup_ancestor(THD *thd, Item **conds,
bool res= FALSE;
DBUG_ENTER("st_table_list::setup_ancestor");
if (check_stack_overrun(thd, (char *)&res))
if (check_stack_overrun(thd, STACK_MIN_SIZE, (char *)&res))
return TRUE;
for (tbl= ancestor; tbl; tbl= tbl->next_local)