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 on pull

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
include/my_sys.h:
  Auto merged
mysql-test/r/func_in.result:
  Auto merged
This commit is contained in:
unknown
2004-09-09 07:26:28 +03:00
parent c92b534970 33efc9677d
commit e18b7ea959
758 changed files with 39936 additions and 18741 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 */