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

Browse Source 
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
This commit is contained in:
unknown
2004-09-09 16:52:22 +03:00
parent 7de077f7df bc78725424
commit ed2c4854dd
760 changed files with 40039 additions and 18740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_view.cc
View File

@ -280,9 +280,9 @@ int mysql_create_view(THD *thd,
}
#endif
if (wait_if_global_read_lock(thd, 0))
if (wait_if_global_read_lock(thd, 0, 0))
{
VOID(pthread_mutex_unlock(&LOCK_open));
res= -1;
goto err;
}
VOID(pthread_mutex_lock(&LOCK_open));
@ -523,7 +523,9 @@ mysql_make_view(File_parser *parser, TABLE_LIST *table)
will be TRUE as far as we make new table cache).
*/
Item_arena *arena= thd->current_arena, backup;
if (arena)
if (!arena->is_stmt_prepare())
arena= 0;
else
thd->set_n_backup_item_arena(arena, &backup);
/* init timestamp */