diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-08-30 18:07:40 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-08-30 18:07:40 +0400 |
| commit | f0fe6e4dac44c9555de1193990e9d2cbc77be62e (patch) | |
| tree | 0a5202757c09044f2c476f93621c75c9df31e32d /include/mysql/plugin.h | |
| parent | b7ed981f3793b4464b99c98b7baa3c511b52b6a5 (diff) | |
| parent | 9ab0759ea4534c1581dfb62f2f7e3a6e06d3c3c3 (diff) | |
| download | mariadb-git-f0fe6e4dac44c9555de1193990e9d2cbc77be62e.tar.gz | |
Auto-merge from mysql-5.5-merge.
Diffstat (limited to 'include/mysql/plugin.h')
| -rw-r--r-- | include/mysql/plugin.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index b6d16ce2b9f..43de7deef74 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -528,6 +528,7 @@ long long thd_test_options(const MYSQL_THD thd, long long test_options); int thd_sql_command(const MYSQL_THD thd); const char *thd_proc_info(MYSQL_THD thd, const char *info); void **thd_ha_data(const MYSQL_THD thd, const struct handlerton *hton); +void thd_storage_lock_wait(MYSQL_THD thd, long long value); int thd_tx_isolation(const MYSQL_THD thd); char *thd_security_context(MYSQL_THD thd, char *buffer, unsigned int length, unsigned int max_query_len); |