percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-12-23 02:00:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for 1078887: Don't clobber the sql_mode set by the script with set-vars

Browse Source
This commit is contained in:
Brian Fraser
2012-12-03 00:43:10 -03:00
parent e71d3adb96
commit d98f8e04c9
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/DSNParser.pm
View File

@@ -343,18 +343,6 @@ sub get_dbh {
die "Error getting the current SQL_MODE: $EVAL_ERROR";
}
$sql = 'SET @@SQL_QUOTE_SHOW_CREATE = 1'
. '/*!40101, @@SQL_MODE=\'NO_AUTO_VALUE_ON_ZERO'
. ($sql_mode ? ",$sql_mode" : '')
. '\'*/';
PTDEBUG && _d($dbh, $sql);
eval { $dbh->do($sql) };
if ( $EVAL_ERROR ) {
die "Error setting SQL_QUOTE_SHOW_CREATE, SQL_MODE"
. ($sql_mode ? " and $sql_mode" : '')
. ": $EVAL_ERROR";
}
# Set character set and binmode on STDOUT.
if ( my ($charset) = $cxn_string =~ m/charset=([\w]+)/ ) {
$sql = qq{/*!40101 SET NAMES "$charset"*/};
@@ -381,6 +369,20 @@ sub get_dbh {
die "Error setting $var: $EVAL_ERROR";
}
}
# Do this after set-vars so a user-set sql_mode doesn't clobber it; See
# https://bugs.launchpad.net/percona-toolkit/+bug/1078887
$sql = 'SET @@SQL_QUOTE_SHOW_CREATE = 1'
. '/*!40101, @@SQL_MODE=\'NO_AUTO_VALUE_ON_ZERO'
. ($sql_mode ? ",$sql_mode" : '')
. '\'*/';
PTDEBUG && _d($dbh, $sql);
eval { $dbh->do($sql) };
if ( $EVAL_ERROR ) {
die "Error setting SQL_QUOTE_SHOW_CREATE, SQL_MODE"
. ($sql_mode ? " and $sql_mode" : '')
. ": $EVAL_ERROR";
}
}
PTDEBUG && _d('DBH info: ',