database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge vajra.(none):/opt/local/work/mysql-5.0-21483

Browse Source 
into  vajra.(none):/opt/local/work/mysql-5.1-21483
This commit is contained in:
kostja@vajra.(none)
2007-05-16 10:21:39 +04:00
parent b5f3273203 f10effe402
commit e1218d0e75
6 changed files with 436 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_base.cc
View File

@ -3465,7 +3465,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;
TABLE_LIST **save_query_tables_last= thd->lex->query_tables_last;
@ -3651,7 +3651,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)