diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-02-04 12:33:45 +0100 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-02-04 12:33:45 +0100 |
| commit | cd51cbf1e53c01424d270c6a41bf6f2166949a31 (patch) | |
| tree | 72cb72584a02cb3e3932786f66d193666ac33989 | |
| parent | 72933b80eededcd270c2679bfd16841a0648361b (diff) | |
| download | mariadb-git-cd51cbf1e53c01424d270c6a41bf6f2166949a31.tar.gz | |
Bug #47141 "mysqltest" breaks because it tries to act on a debug option which is disabled
Replace --debug with --loose-debug to prevent failure exit
Update: added workaround for 50627, skip all debugging of mysqlbinlog
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 03dd3e5bd3f..27e52d814e4 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1783,9 +1783,12 @@ sub executable_setup () { sub client_debug_arg($$) { my ($args, $client_name)= @_; + # Workaround for Bug #50627: drop any debug opt + return if $client_name =~ /^mysqlbinlog/; + if ( $opt_debug ) { mtr_add_arg($args, - "--debug=d:t:A,%s/log/%s.trace", + "--loose-debug=d:t:A,%s/log/%s.trace", $path_vardir_trace, $client_name) } } |