diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-01-26 22:54:27 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-01-26 22:54:27 -0500 |
| commit | 7cda4bee0ef7c8a3ec85e94bc1443ceaba3a64e8 (patch) | |
| tree | f8c1f556f36f026038015e7215ae88b0cb7b1ce5 /sql/lock.cc | |
| parent | ea229eb6bb29ee7b11a7d28a7d4c80a593cb1d3b (diff) | |
| parent | fb71449b10100e9a0f887b1585000fbfab294f3c (diff) | |
| download | mariadb-git-7cda4bee0ef7c8a3ec85e94bc1443ceaba3a64e8.tar.gz | |
maria-10.0.16 merge
bzr merge -r4588 maria/10.0
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 4d7afc697ef..7c8368ab0e3 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -305,15 +305,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, @@ -331,7 +332,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); #ifdef WITH_WSREP thd_proc_info(thd, "mysql_lock_tables(): unlocking tables II"); #else /* WITH_WSREP */ |