diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-01-31 21:48:47 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-01-31 21:48:47 +0100 |
| commit | 4b21cd21fef2763d757aa15681c9c9a7ed5db3c9 (patch) | |
| tree | e9e233392b47f93de12cecce1f7f403ce26057b0 /sql/lock.cc | |
| parent | 0b049b40124d72d77c008d4441e4db2e77f0f127 (diff) | |
| parent | a06624d61f36c70edd63adcfe2803bb7a8564de5 (diff) | |
| download | mariadb-git-4b21cd21fef2763d757aa15681c9c9a7ed5db3c9.tar.gz | |
Merge branch '10.0' into merge-wip
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index c9aa49a4057..c241e635e6b 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -303,15 +303,16 @@ bool mysql_lock_tables(THD *thd, MYSQL_LOCK *sql_lock, uint flags) int rc= 1; ulong timeout= (flags & MYSQL_LOCK_IGNORE_TIMEOUT) ? LONG_TIMEOUT : thd->variables.lock_wait_timeout; - + PSI_stage_info org_stage; DBUG_ENTER("mysql_lock_tables(sql_lock)"); - THD_STAGE_INFO(thd, stage_system_lock); + thd->enter_stage(&stage_system_lock, &org_stage, __func__, __FILE__, + __LINE__); if (sql_lock->table_count && lock_external(thd, sql_lock->table, sql_lock->table_count)) goto end; - thd_proc_info(thd, "Table lock"); + THD_STAGE_INFO(thd, stage_table_lock); /* Copy the lock data array. thr_multi_lock() reorders its contents. */ memmove(sql_lock->locks + sql_lock->lock_count, sql_lock->locks, @@ -326,7 +327,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); + THD_STAGE_INFO(thd, org_stage); if (thd->killed) { |