diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-18 13:29:04 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-18 13:29:04 +0200 |
| commit | 5139bf6c8f2cde4b598aa0e822f126936346f914 (patch) | |
| tree | b38d061771d52ab55fe9d428e45627d4c08d5f63 /include/mysql/plugin.h.pp | |
| parent | bd75361929caadac565d471d7e374060ff93794d (diff) | |
| parent | 8977575cff0ed295692e866b1cd543bdf49c0a20 (diff) | |
| download | mariadb-git-5139bf6c8f2cde4b598aa0e822f126936346f914.tar.gz | |
Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime.
Diffstat (limited to 'include/mysql/plugin.h.pp')
| -rw-r--r-- | include/mysql/plugin.h.pp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/mysql/plugin.h.pp b/include/mysql/plugin.h.pp index ce9902ee418..55d62b8daab 100644 --- a/include/mysql/plugin.h.pp +++ b/include/mysql/plugin.h.pp @@ -151,6 +151,7 @@ long long thd_test_options(const void* thd, long long test_options); int thd_sql_command(const void* thd); const char *thd_proc_info(void* thd, const char *info); void **thd_ha_data(const void* thd, const struct handlerton *hton); +void thd_storage_lock_wait(void* thd, long long value); int thd_tx_isolation(const void* thd); char *thd_security_context(void* thd, char *buffer, unsigned int length, unsigned int max_query_len); |