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

Browse Source 
into  vajra.(none):/opt/local/work/mysql-5.0-21483
This commit is contained in:
kostja@vajra.(none)
2007-05-16 09:52:01 +04:00
parent 35616ba5c7 747842e10b
commit f10effe402
6 changed files with 436 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_base.cc
View File

@ -2633,7 +2633,7 @@ int open_tables(THD *thd, TABLE_LIST **start, uint *counter, uint flags)
*/
if (!thd->prelocked_mode && !thd->lex->requires_prelocking() &&
thd->lex->sroutines_list.elements)
thd->lex->uses_stored_routines())
{
bool first_no_prelocking, need_prelocking, tabs_changed;
TABLE_LIST **save_query_tables_last= thd->lex->query_tables_last;
@ -2821,7 +2821,7 @@ process_view_routines:
*/
if (tables->view && !thd->prelocked_mode &&
!thd->lex->requires_prelocking() &&
tables->view->sroutines_list.elements)
tables->view->uses_stored_routines())
{
/* We have at least one table in TL here. */
if (!query_tables_last_own)