diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-07-02 20:43:35 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-07-02 20:43:35 +0300 |
| commit | 99aae21ed25b42ee3cf62815ecfc8204de8b6fd0 (patch) | |
| tree | ac9a51c525b3ad668a7c8dbde44e34e14771c512 /sql/debug_sync.h | |
| parent | b7b2a7ce81bf9d1bbcac9e0b3b0b19e271f2c276 (diff) | |
| download | mariadb-git-99aae21ed25b42ee3cf62815ecfc8204de8b6fd0.tar.gz | |
mdl_sync now works.
mysql-test/r/mdl_sync.result:
Full merge with 5.6
mysql-test/t/mdl_sync.test:
Full merge with 5.6
sql/debug_sync.cc:
Full merge with 5.6
sql/debug_sync.h:
Full merge with 5.6
sql/mdl.cc:
Full merge with 5.6
sql/sql_base.cc:
Removed code not in 5.6 anymore
Diffstat (limited to 'sql/debug_sync.h')
| -rw-r--r-- | sql/debug_sync.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/debug_sync.h b/sql/debug_sync.h index 4d29d6e7508..bf1b3167dbc 100644 --- a/sql/debug_sync.h +++ b/sql/debug_sync.h @@ -32,6 +32,9 @@ class THD; #if defined(ENABLED_DEBUG_SYNC) +/* Command line option --debug-sync-timeout. See mysqld.cc. */ +extern MYSQL_PLUGIN_IMPORT uint opt_debug_sync_timeout; + /* Default WAIT_FOR timeout if command line option is given without argument. */ #define DEBUG_SYNC_DEFAULT_WAIT_TIMEOUT 300 |