mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Bug #46322 Sporadic timeout in mysql_upgrade.test
Apparently caused by logging to table Turn on logging to file only, add to .opt file for tests needing log to table
This commit is contained in:
@ -4105,8 +4105,8 @@ sub mysqld_arguments ($$$) {
|
|||||||
|
|
||||||
if ( $mysql_version_id >= 50106 )
|
if ( $mysql_version_id >= 50106 )
|
||||||
{
|
{
|
||||||
# Turn on logging to both tables and file
|
# Turn on logging to file
|
||||||
mtr_add_arg($args, "--log-output=table,file");
|
mtr_add_arg($args, "--log-output=file");
|
||||||
}
|
}
|
||||||
|
|
||||||
# Check if "extra_opt" contains skip-log-bin
|
# Check if "extra_opt" contains skip-log-bin
|
||||||
|
@ -1 +1 @@
|
|||||||
--log-slow-queries
|
--log-output=table,file --log-slow-queries
|
||||||
|
@ -1 +1 @@
|
|||||||
--log-slow-queries
|
--log-output=table,file --log-slow-queries
|
||||||
|
@ -1 +1 @@
|
|||||||
--log-slow-queries --log-long-format --log-queries-not-using-indexes
|
--log-output=table,file --log-slow-queries --log-long-format --log-queries-not-using-indexes
|
||||||
|
@ -1 +1 @@
|
|||||||
--log-slow-queries --log-long-format --log-queries-not-using-indexes --myisam-recover=""
|
--log-output=table,file --log-slow-queries --log-long-format --log-queries-not-using-indexes --myisam-recover=""
|
||||||
|
1
mysql-test/t/status-master.opt
Normal file
1
mysql-test/t/status-master.opt
Normal file
@ -0,0 +1 @@
|
|||||||
|
--log-output=table,file
|
Reference in New Issue
Block a user