Bug #43588 mysqltest command disable_abort_on_error logs connect commands
Only log connects after --error A few small test adjustments needed/possible
This commit is contained in:
parent
eb235387ae
commit
ddb6a95abd
@ -4920,7 +4920,7 @@ int connect_n_handle_errors(struct st_command *command,
|
|||||||
ds= &ds_res;
|
ds= &ds_res;
|
||||||
|
|
||||||
/* Only log if an error is expected */
|
/* Only log if an error is expected */
|
||||||
if (!command->abort_on_error &&
|
if (command->expected_errors.count > 0 &&
|
||||||
!disable_query_log)
|
!disable_query_log)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
@ -447,7 +447,6 @@ OK
|
|||||||
mysqltest: The test didn't produce any output
|
mysqltest: The test didn't produce any output
|
||||||
mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 3: connection 'test_con1' not found in connection pool
|
mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 3: connection 'test_con1' not found in connection pool
|
||||||
mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 2: Connection test_con1 already exists
|
mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 2: Connection test_con1 already exists
|
||||||
connect(localhost,root,,test,MASTER_PORT,MASTER_SOCKET);
|
|
||||||
show tables;
|
show tables;
|
||||||
ERROR 3D000: No database selected
|
ERROR 3D000: No database selected
|
||||||
Output from mysqltest-x.inc
|
Output from mysqltest-x.inc
|
||||||
|
@ -500,11 +500,7 @@ INSERT INTO t2 VALUES (),();
|
|||||||
CREATE OR REPLACE VIEW v1 AS SELECT 1 FROM t2
|
CREATE OR REPLACE VIEW v1 AS SELECT 1 FROM t2
|
||||||
WHERE b =(SELECT a FROM t1 LIMIT 1);
|
WHERE b =(SELECT a FROM t1 LIMIT 1);
|
||||||
|
|
||||||
--disable_query_log
|
|
||||||
--disable_result_log
|
|
||||||
CONNECT (con1, localhost, root,,);
|
CONNECT (con1, localhost, root,,);
|
||||||
--enable_query_log
|
|
||||||
--enable_result_log
|
|
||||||
CONNECTION default;
|
CONNECTION default;
|
||||||
|
|
||||||
DELIMITER |;
|
DELIMITER |;
|
||||||
|
@ -1441,7 +1441,6 @@ EOF
|
|||||||
remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql;
|
remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql;
|
||||||
|
|
||||||
# connect when "disable_abort_on_error" caused "connection not found"
|
# connect when "disable_abort_on_error" caused "connection not found"
|
||||||
--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
|
|
||||||
--disable_abort_on_error
|
--disable_abort_on_error
|
||||||
connect (con1,localhost,root,,);
|
connect (con1,localhost,root,,);
|
||||||
connection default;
|
connection default;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user