MDEV-39829/MDEV-33532 s3.debug test failure

MDEV-39516 corrected the interface with curl particularly around
passing options.

After this the s3.debug actually enabled curl debugging like is
was meant to. With this enabled, there are addition s3_test_ pattens
in the result file, from the error log where curl correctly provide
debug message.

ps-protocol test also failed under MDEV-33532 where a differnet
number of entries was recored.

Correct variations by using the $database/$table rather than just the
s3_test_ pattern.

As the purpose of this test is to check if s3_debug is dynamic, the
second part of the test searches for a previously, under s3_debug=1,
table t2 interaction, where the results should be NOT_FOUND.

Remove count from the result file to allow for different curl versions
and the possibiliy of being run under ps-protocol.

Author: grooverdan

mysql-test/suite/s3/debug.result

@@ -2,9 +2,12 @@ drop table if exists t1;
 #
 # MDEV-32884 Make s3_debug dynamic
 #
+set @save_s3_debug=@@global.s3_debug;
 create or replace table t1 (a int, b int, c varchar(1000), key (a), key(c)) engine=aria;
 insert into t1 select seq, seq+10, repeat(char(65+ mod(seq, 20)),mod(seq,1000)) from seq_1_to_100;
+create table t2 as select * from t1;
 alter table t1 engine=s3;
+alter table t2 engine=s3;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -17,16 +20,17 @@ t1	CREATE TABLE `t1` (
 select count(*) from t1;
 count(*)
 100
-flush table t1;
-NOT FOUND /s3_test_/ in mysqld.1.err
+flush table t1, t2;
+NOT FOUND matches in mysqld.1.err
 set @@global.s3_debug=1;
 select count(*) from t1;
 count(*)
 100
 set @@global.s3_debug=0;
-FOUND 8 /s3_test_/ in mysqld.1.err
-select count(*) from t1;
+FOUND NUMBER matches in mysqld.1.err
+select count(*) from t2;
 count(*)
 100
-drop table t1;
-FOUND 8 /s3_test_/ in mysqld.1.err
+drop table t1, t2;
+NOT FOUND matches in mysqld.1.err
+set @@global.s3_debug=@save_s3_debug;

mysql-test/suite/s3/debug.test

@@ -13,22 +13,29 @@ drop table if exists t1;
 --echo # MDEV-32884 Make s3_debug dynamic
 --echo #
 
+set @save_s3_debug=@@global.s3_debug;
 create or replace table t1 (a int, b int, c varchar(1000), key (a), key(c)) engine=aria;
 insert into t1 select seq, seq+10, repeat(char(65+ mod(seq, 20)),mod(seq,1000)) from seq_1_to_100;
+create table t2 as select * from t1;
 alter table t1 engine=s3;
+alter table t2 engine=s3;
 show create table t1;
 select count(*) from t1;
-flush table t1;
+flush table t1, t2;
 
 --let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err
---let SEARCH_PATTERN=s3_test_
+--let SEARCH_PATTERN=$database/t1
+--let SEARCH_OUTPUT=count
 --source include/search_pattern_in_file.inc
 set @@global.s3_debug=1;
 select count(*) from t1;
 set @@global.s3_debug=0;
+--replace_regex / [0-9]+/ NUMBER/
 --source include/search_pattern_in_file.inc
-select count(*) from t1;
-drop table t1;
+select count(*) from t2;
+drop table t1, t2;
+--let SEARCH_PATTERN=$database/t2
 --source include/search_pattern_in_file.inc
 
+set @@global.s3_debug=@save_s3_debug;
 --source drop_database.inc