minimized error string match to favour compatibility

This commit is contained in:
Frank Cizmich
2014-07-30 12:56:05 -03:00
parent ccfe78b9f3
commit 9c5540b010

View File

@@ -10561,7 +10561,7 @@ sub exec_nibble {
if ( $error =~ m/Lock wait timeout exceeded/
|| $error =~ m/Query execution was interrupted/
|| $error =~ m/Deadlock found when trying to get lock/
|| $error =~ m/Deadlock found/
) {
# These errors/warnings can be retried, so don't print
# a warning yet; do that in final_fail.
@@ -10585,9 +10585,9 @@ sub exec_nibble {
my (%args) = @_;
my $error = $args{error};
if ( $error =~ /Lock wait timeout exceeded/
|| $error =~ /Query execution was interrupted/
|| $error =~ /Deadlock found when trying to get lock/
if ( $error =~ m/Lock wait timeout exceeded/
|| $error =~ m/Query execution was interrupted/
|| $error =~ m/Deadlock found/
) {
# These errors/warnings are not fatal but only cause this
# nibble to be skipped.