diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-02 20:58:45 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-02 20:58:45 +0300 |
| commit | e415ba0fb2c57eaf370e84a3a9c8d831f820a560 (patch) | |
| tree | f113a8024de4ee4f1bc19aae98c19a2835f5b4e7 /sql/sql_base.cc | |
| parent | 046418ad956c98c3788d79650fcb50479844df3b (diff) | |
| parent | a1f7ceb281f9d87c9baea125ebab26f99a0370f8 (diff) | |
| download | mariadb-git-e415ba0fb2c57eaf370e84a3a9c8d831f820a560.tar.gz | |
Merge with MySQL 5.1.57/58
Moved some BSD string functions from Unireg
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 e55fce90291..59bbd85682c 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2807,10 +2807,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; |