diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-10 18:17:43 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-10 18:17:43 +0300 |
| commit | ce3b7273a6b5b5bf3dc4a0f3c72ef9889d091f59 (patch) | |
| tree | d7eed818fd8b648e5eabe0dbad53e61665d8dc37 /sql/sql_base.cc | |
| parent | 355e250544e69df7b547d8950bc9febfc5668be6 (diff) | |
| parent | 82b49178600e3b21f378bef71b8f9e81bc7bcd3a (diff) | |
| download | mariadb-git-ce3b7273a6b5b5bf3dc4a0f3c72ef9889d091f59.tar.gz | |
Merge with MariaDB 5.2
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index fa495a776e1..c0b69ac7b54 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2827,10 +2827,9 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root, ("Found table '%s.%s' with different refresh version", table_list->db, table_list->table_name)); - /* Ignore FLUSH, but not name locks! */ + /* Ignore FLUSH and pending name locks, but not acquired name locks! */ if (flags & MYSQL_LOCK_IGNORE_FLUSH && !table->open_placeholder) { - DBUG_ASSERT(table->db_stat); /* Force close at once after usage */ thd->version= table->s->version; continue; |