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

error message interception (Bug#4598)

Browse Source 
error handling of view initialization fixed (Bug#4599)
This commit is contained in:
bell@sanja.is.com.ua
2004-07-21 04:26:20 +03:00
parent 77a230c675
commit ad9a6e0858
30 changed files with 85 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_view.cc
View File

@ -483,6 +483,10 @@ static int mysql_register_view(THD *thd, TABLE_LIST *view,
mysql_make_view()
parser - parser object;
table - TABLE_LIST structure for filling
RETURN
TRUE OK
FALSE error
*/
my_bool
mysql_make_view(File_parser *parser, TABLE_LIST *table)
@ -576,6 +580,9 @@ mysql_make_view(File_parser *parser, TABLE_LIST *table)
}
if (!res && !thd->is_fatal_error)
{
TABLE_LIST *top_view= (table->belong_to_view ?
table->belong_to_view :
table);
/* move SP to main LEX */
sp_merge_funs(old_lex, lex);
@ -586,9 +593,12 @@ mysql_make_view(File_parser *parser, TABLE_LIST *table)
if ((table->next_global= lex->query_tables))
table->next_global->prev_global= &table->next_global;
/* mark to avoid temporary table using */
/* mark to avoid temporary table using and put view reference*/
for (TABLE_LIST *tbl= table->next_global; tbl; tbl= tbl->next_global)
{
tbl->skip_temporary= 1;
tbl->belong_to_view= top_view;
}
/*
check rights to run commands (EXPLAIN SELECT & SHOW CREATE) which show