diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 11:09:55 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 11:09:55 -0400 |
| commit | 086af8367ed2499adae378638225ceb14c85f046 (patch) | |
| tree | 953720d86a4decd67a24b560ffbe277900ff9609 /sql/lock.cc | |
| parent | 558995ad84ca1348dfe681a8d111650225fcc205 (diff) | |
| parent | 1170a54060168d885cbf682836342d4fc4ccae1a (diff) | |
| download | mariadb-git-086af8367ed2499adae378638225ceb14c85f046.tar.gz | |
bzr merge -r4209 maria/10.0.
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index 793b56f965d..082a5827908 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -331,6 +331,7 @@ bool mysql_lock_tables(THD *thd, MYSQL_LOCK *sql_lock, uint flags) (void) unlock_external(thd, sql_lock->table, sql_lock->table_count); end: + THD_STAGE_INFO(thd, stage_after_table_lock); #ifdef WITH_WSREP thd_proc_info(thd, "mysql_lock_tables(): unlocking tables II"); #else /* WITH_WSREP */ @@ -877,6 +878,8 @@ bool lock_object_name(THD *thd, MDL_key::enum_mdl_namespace mdl_type, MDL_request schema_request; MDL_request mdl_request; + DBUG_ASSERT(ok_for_lower_case_names(db)); + if (thd->locked_tables_mode) { my_message(ER_LOCK_OR_ACTIVE_TRANSACTION, |