test.cnf files should !include default_my.cnf

not default_mysqld.cnf. The latter has only server settings, it misses mtr-specific client configuration Except for spider, that doesn't use mysqld.1 server and default_my.cnf starts it automatically. Spider tests have to include both default_mysqld.cnf and default_client.cnf
MariaDB · Feb 3, 2024 · d7699c5 · d7699c5
1 parent ec5403f
commit d7699c5
Show file tree

Hide file tree

Showing 115 changed files with 115 additions and 51 deletions.
diff --git a/mysql-test/include/default_my.cnf b/mysql-test/include/default_my.cnf
@@ -27,9 +27,6 @@
 # Run tests with the performance schema instrumentation
 loose-enable-performance-schema
 
-[mysqlbinlog]
-disable-force-if-open
-
 [ENV]
 MASTER_MYPORT=           @mysqld.1.port
 MASTER_MYSOCK=           @mysqld.1.socket

diff --git a/mysql-test/main/mysqlbinlog.test b/mysql-test/main/mysqlbinlog.test
@@ -335,7 +335,7 @@ exec $MYSQL_BINLOG $MYSQL_TEST_DIR/std_data/corrupt-relay-bin.000624 > $MYSQLTES
 FLUSH LOGS;
 
 --error 1
---exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000017 >/dev/null 2>/dev/null
+--exec $MYSQL_BINLOG --disable-force-if-open $MYSQLD_DATADIR/master-bin.000017 >/dev/null 2>/dev/null
 --exec $MYSQL_BINLOG --force-if-open $MYSQLD_DATADIR/master-bin.000017 >/dev/null 2>/dev/null
 
 --echo Bug#31611 Security risk with BINLOG statement

diff --git a/mysql-test/suite/binlog_encryption/my.cnf b/mysql-test/suite/binlog_encryption/my.cnf
@@ -1,5 +1,4 @@
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 innodb

diff --git a/mysql-test/suite/federated/my.cnf b/mysql-test/suite/federated/my.cnf
@@ -1,6 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 federated

diff --git a/mysql-test/suite/galera/galera_2nodes.cnf b/mysql-test/suite/galera/galera_2nodes.cnf
@@ -1,5 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 loose-innodb

diff --git a/mysql-test/suite/galera/galera_2nodes_as_master.cnf b/mysql-test/suite/galera/galera_2nodes_as_master.cnf
@@ -4,7 +4,7 @@
 #
 
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 loose-innodb

diff --git a/mysql-test/suite/galera/galera_2nodes_as_slave.cnf b/mysql-test/suite/galera/galera_2nodes_as_slave.cnf
@@ -3,7 +3,7 @@
 #
 
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 loose-innodb

diff --git a/mysql-test/suite/galera/galera_2x2nodes.cnf b/mysql-test/suite/galera/galera_2x2nodes.cnf
@@ -1,5 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 loose-innodb

diff --git a/mysql-test/suite/galera/galera_3nodes_as_slave.cnf b/mysql-test/suite/galera/galera_3nodes_as_slave.cnf
@@ -3,7 +3,7 @@
 #
 
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 loose-innodb

diff --git a/mysql-test/suite/galera/galera_4nodes.cnf b/mysql-test/suite/galera/galera_4nodes.cnf
@@ -1,5 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 loose-innodb

diff --git a/mysql-test/suite/galera_3nodes/galera_2x3nodes.cnf b/mysql-test/suite/galera_3nodes/galera_2x3nodes.cnf
@@ -1,5 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 loose-innodb

diff --git a/mysql-test/suite/galera_3nodes/galera_3nodes.cnf b/mysql-test/suite/galera_3nodes/galera_3nodes.cnf
@@ -1,5 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 loose-innodb

diff --git a/mysql-test/suite/mariabackup/slave_provision_nolock.cnf b/mysql-test/suite/mariabackup/slave_provision_nolock.cnf
@@ -1,3 +1,5 @@
+!include include/default_my.cnf
+
 [mysqld.1]
 log-slave-updates
 loose-innodb

diff --git a/mysql-test/suite/multi_source/my.cnf b/mysql-test/suite/multi_source/my.cnf
@@ -1,6 +1,5 @@
 # cat t/multisource1.cnf
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 server-id=1

diff --git a/mysql-test/suite/perfschema/t/cnf_option.cnf b/mysql-test/suite/perfschema/t/cnf_option.cnf
@@ -2,7 +2,7 @@
 # Check server start options, read from a .cnf file
 
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 loose-performance-schema-max-thread_instances=318

diff --git a/mysql-test/suite/rpl/rpl_1slave_base.cnf b/mysql-test/suite/rpl/rpl_1slave_base.cnf
@@ -1,6 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 

diff --git a/mysql-test/suite/rpl/t/rpl_ip_mix.cnf b/mysql-test/suite/rpl/t/rpl_ip_mix.cnf
@@ -1,6 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 

diff --git a/mysql-test/suite/rpl/t/rpl_ip_mix2.cnf b/mysql-test/suite/rpl/t/rpl_ip_mix2.cnf
@@ -1,6 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 

diff --git a/mysql-test/suite/rpl/t/rpl_ipv4_as_ipv6.cnf b/mysql-test/suite/rpl/t/rpl_ipv4_as_ipv6.cnf
@@ -1,6 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 

diff --git a/mysql-test/suite/rpl/t/rpl_ipv6.cnf b/mysql-test/suite/rpl/t/rpl_ipv6.cnf
@@ -1,6 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 

diff --git a/mysql-test/suite/rpl/t/rpl_row_img.cnf b/mysql-test/suite/rpl/t/rpl_row_img.cnf
@@ -1,4 +1,4 @@
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 log-slave-updates

diff --git a/mysql-test/suite/rpl/t/rpl_row_img_sequence_full.cnf b/mysql-test/suite/rpl/t/rpl_row_img_sequence_full.cnf
@@ -1,4 +1,4 @@
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 log-slave-updates

diff --git a/mysql-test/suite/rpl/t/rpl_row_img_sequence_full_nodup.cnf b/mysql-test/suite/rpl/t/rpl_row_img_sequence_full_nodup.cnf
@@ -1,4 +1,4 @@
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 log-slave-updates

diff --git a/mysql-test/suite/rpl/t/rpl_row_img_sequence_min.cnf b/mysql-test/suite/rpl/t/rpl_row_img_sequence_min.cnf
@@ -1,4 +1,4 @@
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 log-slave-updates

diff --git a/mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.cnf b/mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.cnf
@@ -1,4 +1,4 @@
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 log-slave-updates

diff --git a/mysql-test/suite/rpl/t/rpl_xa_empty_transaction.cnf b/mysql-test/suite/rpl/t/rpl_xa_empty_transaction.cnf
@@ -1,4 +1,4 @@
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 log-slave-updates

diff --git a/mysql-test/suite/s3/my.cnf b/mysql-test/suite/s3/my.cnf
@@ -1,5 +1,4 @@
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 plugin-load-add=@ENV.HA_S3_SO

diff --git a/mysql-test/suite/sys_vars/t/slave_parallel_threads_basic.cnf b/mysql-test/suite/sys_vars/t/slave_parallel_threads_basic.cnf
@@ -1,5 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 slave_parallel_threads=20
diff --git a/mysql-test/suite/wsrep/my.cnf b/mysql-test/suite/wsrep/my.cnf
@@ -1,5 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 wsrep-on=ON

diff --git a/mysql-test/suite/wsrep/t/alter_table_innodb.cnf b/mysql-test/suite/wsrep/t/alter_table_innodb.cnf
@@ -1,4 +1,4 @@
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 wsrep-on=0

diff --git a/mysql-test/suite/wsrep/t/mdev_10186.cnf b/mysql-test/suite/wsrep/t/mdev_10186.cnf
@@ -1,4 +1,4 @@
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 wsrep-on=0

diff --git a/mysql-test/suite/wsrep/t/wsrep_provider_plugin_wsrep_off.cnf b/mysql-test/suite/wsrep/t/wsrep_provider_plugin_wsrep_off.cnf
@@ -1,5 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 wsrep-on=OFF

diff --git a/mysql-test/suite/wsrep/t/wsrep_variables_wsrep_off.cnf b/mysql-test/suite/wsrep/t/wsrep_variables_wsrep_off.cnf
@@ -1,5 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 wsrep-on=OFF

diff --git a/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf b/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf
@@ -1,5 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 binlog-format=row

diff --git a/storage/connect/mysql-test/connect/my.cnf b/storage/connect/mysql-test/connect/my.cnf
@@ -1,6 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 #log-bin=                master-bin

diff --git a/storage/rocksdb/mysql-test/rocksdb_hotbackup/base.cnf b/storage/rocksdb/mysql-test/rocksdb_hotbackup/base.cnf
@@ -1,6 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 rocksdb

diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/rpl_1slave_base.cnf b/storage/rocksdb/mysql-test/rocksdb_rpl/rpl_1slave_base.cnf
@@ -1,6 +1,5 @@
 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 

diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_missing_columns_sk_update.cnf b/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_missing_columns_sk_update.cnf
@@ -1,4 +1,4 @@
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 binlog_row_image = COMPLETE

diff --git a/storage/spider/mysql-test/spider/bg/my.cnf b/storage/spider/mysql-test/spider/bg/my.cnf
@@ -1,5 +1,6 @@
 # Use default setting for mysqld processes
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 
 [mysqld.1.1]
 loose_handlersocket_port=                20000

diff --git a/storage/spider/mysql-test/spider/bugfix/my.cnf b/storage/spider/mysql-test/spider/bugfix/my.cnf
@@ -1,2 +1,3 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include my_1_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/checksum_table_with_quick_mode_3.cnf b/storage/spider/mysql-test/spider/bugfix/t/checksum_table_with_quick_mode_3.cnf
@@ -1,3 +1,4 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/cp932_column.cnf b/storage/spider/mysql-test/spider/bugfix/t/cp932_column.cnf
@@ -1,3 +1,4 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_default.cnf b/storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_default.cnf
@@ -1,4 +1,5 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
 !include ../my_4_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_mariadb.cnf b/storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_mariadb.cnf
@@ -1,4 +1,5 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
 !include ../my_4_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_mysql.cnf b/storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_mysql.cnf
@@ -1,4 +1,5 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
 !include ../my_4_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/direct_sql_with_comma_pwd.cnf b/storage/spider/mysql-test/spider/bugfix/t/direct_sql_with_comma_pwd.cnf
@@ -1,3 +1,4 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/direct_sql_with_tmp_table.cnf b/storage/spider/mysql-test/spider/bugfix/t/direct_sql_with_tmp_table.cnf
@@ -1,3 +1,4 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/gbh_outer_fields_in_join.cnf b/storage/spider/mysql-test/spider/bugfix/t/gbh_outer_fields_in_join.cnf
@@ -1,3 +1,4 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/group_by_order_by_limit.cnf b/storage/spider/mysql-test/spider/bugfix/t/group_by_order_by_limit.cnf
@@ -1,4 +1,5 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
 !include ../my_2_2.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/insert_select.cnf b/storage/spider/mysql-test/spider/bugfix/t/insert_select.cnf
@@ -1,3 +1,4 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_19866.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_19866.cnf
@@ -1,4 +1,5 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
 !include ../my_2_2.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_20100.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_20100.cnf
@@ -1,3 +1,4 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_20502.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_20502.cnf
@@ -1,3 +1,4 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_21884.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_21884.cnf
@@ -1,3 +1,4 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_22246.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_22246.cnf
@@ -1,4 +1,5 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
 !include ../my_2_2.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_22265.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_22265.cnf
@@ -1,2 +1,3 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_24020.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_24020.cnf
@@ -1,3 +1,4 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_24343.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_24343.cnf
@@ -1,3 +1,4 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_24517.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_24517.cnf
@@ -1,3 +1,4 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_24523.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_24523.cnf
@@ -1,3 +1,4 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_24760.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_24760.cnf
@@ -1,3 +1,4 @@
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf