percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-06 04:17:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check if innodb_lock_wait_timeout exists, don't crash.

Browse Source
This commit is contained in:
Daniel Nichter
2012-05-16 17:36:19 -06:00
parent 603a47d04f
commit 6d0e207af7
3 changed files with 67 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/pt-online-schema-change
View File

@@ -5030,7 +5030,11 @@ sub main {
PTDEBUG && _d($dbh, $sql);
my (undef, $curr_lwt) = $dbh->selectrow_array($sql);
PTDEBUG && _d('innodb_lock_wait_timeout on server:', $curr_lwt);
if ( $curr_lwt > $lock_wait_timeout ) {
if ( !defined $curr_lwt ) {
PTDEBUG && _d('innodb_lock_wait_timeout does not exist;',
'InnoDB is probably disabled');
}
elsif ( $curr_lwt > $lock_wait_timeout ) {
warn "Failed to $set_lwt: $EVAL_ERROR\n"
. "The current innodb_lock_wait_timeout value "
. "$curr_lwt is greater than the --lock-wait-timeout "