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 remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source
This commit is contained in:
Alexander Barkov
2017-04-13 05:52:44 +04:00
parent 012fbc15cf eecce3d7c8
commit 949faa2ec2
130 changed files with 1094 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2759,7 +2759,7 @@ sub mysql_server_start($) {
# Already started
# Write start of testcase to log file
mark_log($mysqld->value('#log-error'), $tinfo);
mark_log($mysqld->value('log-error'), $tinfo);
return;
}
@@ -2816,7 +2816,7 @@ sub mysql_server_start($) {
mkpath($tmpdir) unless -d $tmpdir;
# Write start of testcase to log file
mark_log($mysqld->value('#log-error'), $tinfo);
mark_log($mysqld->value('log-error'), $tinfo);
# Run <tname>-master.sh
if ($mysqld->option('#!run-master-sh') and
@@ -4261,7 +4261,7 @@ sub get_log_from_proc ($$) {
foreach my $mysqld (all_servers()) {
if ($mysqld->{proc} eq $proc) {
my @srv_lines= extract_server_log($mysqld->if_exist('#log-error'), $name);
my @srv_lines= extract_server_log($mysqld->if_exist('log-error'), $name);
$srv_log= "\nServer log from this test:\n" .
"----------SERVER LOG START-----------\n". join ("", @srv_lines) .
"----------SERVER LOG END-------------\n";
@@ -4468,7 +4468,7 @@ sub start_check_warnings ($$) {
my $name= "warnings-".$mysqld->name();
my $log_error= $mysqld->value('#log-error');
my $log_error= $mysqld->value('log-error');
# To be communicated to the test
$ENV{MTR_LOG_ERROR}= $log_error;
extract_warning_lines($log_error, 0);
@@ -4626,7 +4626,7 @@ sub check_warnings_post_shutdown {
foreach my $mysqld ( mysqlds())
{
my ($testlist, $match_lines)=
extract_warning_lines($mysqld->value('#log-error'), 1);
extract_warning_lines($mysqld->value('log-error'), 1);
$testname_hash->{$_}= 1 for @$testlist;
$report.= join('', @$match_lines);
}
@@ -5075,7 +5075,7 @@ sub mysqld_start ($$) {
# Remove the old pidfile if any
unlink($mysqld->value('pid-file'));
my $output= $mysqld->value('#log-error');
my $output= $mysqld->value('log-error');
if ( $opt_valgrind and $opt_debug )
{