diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-08-12 17:50:23 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-08-12 17:50:23 +0400 |
| commit | 8673d2b20fe3cb1353f7b9b157e72dbf45382a48 (patch) | |
| tree | 9e8417877eab9778cb09f99e71c11401e7749bbc /sql/sys_vars.cc | |
| parent | 65d118b1a4cb3cb4d75226b9280ee80b0d644f70 (diff) | |
| parent | 5fff906edd3d7a5d999cec5403f009f33f8dfb81 (diff) | |
| download | mariadb-git-8673d2b20fe3cb1353f7b9b157e72dbf45382a48.tar.gz | |
Commit on behalf of Dmitry Lenev.
Merge his patch for Bug#52044 into 5.5, and apply
review comments.
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 2285065aa13..13d1e646f04 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1492,7 +1492,8 @@ static bool fix_read_only(sys_var *self, THD *thd, enum_var_type type) can cause to wait on a read lock, it's required for the client application to unlock everything, and acceptable for the server to wait on all locks. */ - if ((result= close_cached_tables(thd, NULL, TRUE))) + if ((result= close_cached_tables(thd, NULL, TRUE, + thd->variables.lock_wait_timeout))) goto end_with_read_lock; if ((result= thd->global_read_lock.make_global_read_lock_block_commit(thd))) |