database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge bb-10.2-ext into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2017-09-21 08:12:19 +03:00
parent d176be8aea f70865bc9e
commit e3d44f5d62
244 changed files with 3631 additions and 2231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/mysql-test-run.pl
View File

@@ -739,8 +739,7 @@ sub run_test_server ($$$) {
# Repeat test $opt_repeat number of times
my $repeat= $result->{repeat} || 1;
# Don't repeat if test was skipped
if ($repeat < $opt_repeat && $result->{'result'} ne 'MTR_RES_SKIPPED')
if ($repeat < $opt_repeat)
{
$result->{retries}= 0;
$result->{rep_failures}++ if $result->{failures};
@@ -4559,8 +4558,8 @@ sub check_warnings ($) {
my $timeout= start_timer(check_timeout($tinfo));
my $result= 0;
while (1){
my $result= 0;
my $proc= My::SafeProcess->wait_any_timeout($timeout);
mtr_report("Got $proc");
@@ -5779,7 +5778,7 @@ sub debugger_arguments {
$$exe= $debugger;
}
elsif ( $debugger =~ /windbg/ )
elsif ( $debugger =~ /windbg|vsjitdebugger/ )
{
# windbg exe arg1 .. argn