Merge branch 'master' into add-tls-support

This commit is contained in:
Shlomi Noach 2019-02-10 11:59:27 +02:00 committed by GitHub
commit 09ef7f4d24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View File

@ -17,7 +17,7 @@ create event gh_ost_test
starts current_timestamp starts current_timestamp
ends current_timestamp + interval 60 second ends current_timestamp + interval 60 second
on completion not preserve on completion not preserve
enable disable on slave
do do
begin begin
insert into gh_ost_test values (null, 11, now(), now(), now(), 0); insert into gh_ost_test values (null, 11, now(), now(), now(), 0);

View File

@ -213,6 +213,7 @@ test_single() {
diff $orig_content_output_file $ghost_content_output_file diff $orig_content_output_file $ghost_content_output_file
echo "diff $orig_content_output_file $ghost_content_output_file" echo "diff $orig_content_output_file $ghost_content_output_file"
return 1 return 1
fi fi
} }