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

Merge mysql.com:/home/dlenev/src/mysql-5.0-merges

into  mysql.com:/home/dlenev/src/mysql-5.1-merges
This commit is contained in:
dlenev@mysql.com
2005-12-12 14:59:14 +03:00
12 changed files with 212 additions and 51 deletions

View File

@ -2760,7 +2760,7 @@ int open_tables(THD *thd, TABLE_LIST **start, uint *counter, uint flags)
if (!query_tables_last_own)
query_tables_last_own= thd->lex->query_tables_last;
if (sp_cache_routines_and_add_tables_for_triggers(thd, thd->lex,
tables->table->triggers))
tables))
{
/*
Serious error during reading stored routines from mysql.proc table.
@ -2790,8 +2790,7 @@ process_view_routines:
/* We have at least one table in TL here. */
if (!query_tables_last_own)
query_tables_last_own= thd->lex->query_tables_last;
if (sp_cache_routines_and_add_tables_for_view(thd, thd->lex,
tables->view))
if (sp_cache_routines_and_add_tables_for_view(thd, thd->lex, tables))
{
/*
Serious error during reading stored routines from mysql.proc table.