diff options
| author | unknown <ingo@mysql.com> | 2005-05-31 19:37:24 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-05-31 19:37:24 +0200 |
| commit | 57d4adf60c7b4c0d341903a29d64f96359e78adb (patch) | |
| tree | 3a0071aee0fc84c8565299dbf4136b73fbea5c29 /sql/sql_base.cc | |
| parent | 7b4385f4725f99ed5115b0f89174fc358498cfe0 (diff) | |
| parent | cf2188ca398e12d4a10c50b069c2243825f9dced (diff) | |
| download | mariadb-git-57d4adf60c7b4c0d341903a29d64f96359e78adb.tar.gz | |
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
Hand merged from 4.0.
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index c580842ce06..98ea4e0adf3 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1163,7 +1163,7 @@ bool reopen_tables(THD *thd,bool get_locks,bool in_refresh) MYSQL_LOCK *lock; /* We should always get these locks */ thd->some_tables_deleted=0; - if ((lock=mysql_lock_tables(thd,tables,(uint) (tables_ptr-tables)))) + if ((lock= mysql_lock_tables(thd, tables, (uint) (tables_ptr-tables), 0))) { thd->locked_tables=mysql_lock_merge(thd->locked_tables,lock); } @@ -1644,7 +1644,7 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type) { DBUG_ASSERT(thd->lock == 0); // You must lock everything at once if ((table->reginfo.lock_type= lock_type) != TL_UNLOCK) - if (!(thd->lock=mysql_lock_tables(thd,&table_list->table,1))) + if (! (thd->lock= mysql_lock_tables(thd, &table_list->table, 1, 0))) table= 0; } } @@ -1794,7 +1794,7 @@ int lock_tables(THD *thd, TABLE_LIST *tables, uint count) if (!table->derived) *(ptr++)= table->table; } - if (!(thd->lock=mysql_lock_tables(thd,start, (uint) (ptr - start)))) + if (! (thd->lock= mysql_lock_tables(thd, start, (uint) (ptr - start), 0))) return -1; /* purecov: inspected */ } else |