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

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

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

mysql-test/suite/binlog_encryption/my.cnf

-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 innodb

mysql-test/suite/federated/my.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 federated

mysql-test/suite/galera/galera_2nodes.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 loose-innodb

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

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

mysql-test/suite/galera/galera_2x2nodes.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 loose-innodb

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

mysql-test/suite/galera/galera_4nodes.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 loose-innodb

mysql-test/suite/galera_3nodes/galera_2x3nodes.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 loose-innodb

mysql-test/suite/galera_3nodes/galera_3nodes.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 loose-innodb

mysql-test/suite/mariabackup/slave_provision_nolock.cnf

+!include include/default_my.cnf
+
 [mysqld.1]
 log-slave-updates
 loose-innodb

mysql-test/suite/multi_source/my.cnf

 # cat t/multisource1.cnf
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 server-id=1

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

mysql-test/suite/rpl/rpl_1slave_base.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 

mysql-test/suite/rpl/t/rpl_ip_mix.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 

mysql-test/suite/rpl/t/rpl_ip_mix2.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 

mysql-test/suite/rpl/t/rpl_ipv4_as_ipv6.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 

mysql-test/suite/rpl/t/rpl_ipv6.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 

mysql-test/suite/rpl/t/rpl_row_img.cnf

-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 log-slave-updates

mysql-test/suite/rpl/t/rpl_row_img_sequence_full.cnf

-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 log-slave-updates

mysql-test/suite/rpl/t/rpl_row_img_sequence_full_nodup.cnf

-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 log-slave-updates

mysql-test/suite/rpl/t/rpl_row_img_sequence_min.cnf

-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 log-slave-updates

mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.cnf

-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 log-slave-updates

mysql-test/suite/rpl/t/rpl_xa_empty_transaction.cnf

-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 log-slave-updates

mysql-test/suite/s3/my.cnf

-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 plugin-load-add=@ENV.HA_S3_SO

mysql-test/suite/sys_vars/t/slave_parallel_threads_basic.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 slave_parallel_threads=20

mysql-test/suite/wsrep/my.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 wsrep-on=ON

mysql-test/suite/wsrep/t/alter_table_innodb.cnf

-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 wsrep-on=0

mysql-test/suite/wsrep/t/mdev_10186.cnf

-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 wsrep-on=0

mysql-test/suite/wsrep/t/wsrep_provider_plugin_wsrep_off.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 wsrep-on=OFF

mysql-test/suite/wsrep/t/wsrep_variables_wsrep_off.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 wsrep-on=OFF

plugin/wsrep_info/mysql-test/wsrep_info/my.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld]
 binlog-format=row

storage/connect/mysql-test/connect/my.cnf

 # 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

storage/rocksdb/mysql-test/rocksdb_hotbackup/base.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 rocksdb

storage/rocksdb/mysql-test/rocksdb_rpl/rpl_1slave_base.cnf

 # Use default setting for mysqld processes
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 

storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_missing_columns_sk_update.cnf

-!include include/default_mysqld.cnf
+!include include/default_my.cnf
 
 [mysqld.1]
 binlog_row_image = COMPLETE

storage/spider/mysql-test/spider/bg/my.cnf

 # Use default setting for mysqld processes
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 
 [mysqld.1.1]
 loose_handlersocket_port=                20000

storage/spider/mysql-test/spider/bugfix/my.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include my_1_1.cnf

storage/spider/mysql-test/spider/bugfix/t/checksum_table_with_quick_mode_3.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/cp932_column.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_default.cnf

 !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

storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_mariadb.cnf

 !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

storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_mysql.cnf

 !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

storage/spider/mysql-test/spider/bugfix/t/direct_sql_with_comma_pwd.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/direct_sql_with_tmp_table.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/gbh_outer_fields_in_join.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/group_by_order_by_limit.cnf

 !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

storage/spider/mysql-test/spider/bugfix/t/insert_select.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_19866.cnf

 !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

storage/spider/mysql-test/spider/bugfix/t/mdev_20100.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_20502.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_21884.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_22246.cnf

 !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

storage/spider/mysql-test/spider/bugfix/t/mdev_22265.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_24020.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_24343.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_24517.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_24523.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_24760.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_25116.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_25684.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_26013.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_26158.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_26247.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_26539.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_26544.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_26582.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_27172.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_27184.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_27239.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_27240.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_28739.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_28854.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_28996.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_29008.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_29011.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_29447.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_29484.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_29562.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_29644.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_29653.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_29667.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_30191.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/mdev_31463.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/quick_mode_0.cnf

 !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

storage/spider/mysql-test/spider/bugfix/t/quick_mode_1.cnf

 !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

storage/spider/mysql-test/spider/bugfix/t/quick_mode_2.cnf

 !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

storage/spider/mysql-test/spider/bugfix/t/quick_mode_3.cnf

 !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

storage/spider/mysql-test/spider/bugfix/t/return_found_rows_insert.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/return_found_rows_update.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/same_server_link.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf

storage/spider/mysql-test/spider/bugfix/t/select_by_null.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/select_with_backquote.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/self_reference.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf

storage/spider/mysql-test/spider/bugfix/t/slave_transaction_retry_errors_5digit.cnf

 !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

storage/spider/mysql-test/spider/bugfix/t/slave_trx_isolation.cnf

 !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

storage/spider/mysql-test/spider/bugfix/t/sql_mode_mariadb.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/sql_mode_mysql.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/strict_group_by.cnf

 !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

storage/spider/mysql-test/spider/bugfix/t/udf_mysql_func_early.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/udf_mysql_func_early_init_file.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/wait_timeout.cnf

 !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

storage/spider/mysql-test/spider/bugfix/t/wrapper_mariadb.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/bugfix/t/xa_cmd.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include ../my_1_1.cnf
 !include ../my_2_1.cnf

storage/spider/mysql-test/spider/feature/my.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include my_1_1.cnf

storage/spider/mysql-test/spider/feature/t/checksum_table_parallel_extended.cnf

 !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

storage/spider/mysql-test/spider/feature/t/checksum_table_parallel_no_opt.cnf

 !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

storage/spider/mysql-test/spider/feature/t/checksum_table_parallel_quick.cnf

 !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

storage/spider/mysql-test/spider/feature/t/engine_defined_attributes.cnf

 !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

storage/spider/mysql-test/spider/feature/t/slave_transaction_retry_errors.cnf

 !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

storage/spider/mysql-test/spider/my.cnf

 # Use default setting for mysqld processes
 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 
 [mysqld.1.1]
 log-bin=                  master-bin

storage/spider/mysql-test/spider/regression/e1121/my.cnf

 !include include/default_mysqld.cnf
+!include include/default_client.cnf
 !include my_1_1.cnf
 !include my_2_1.cnf

storage/spider/mysql-test/spider/regression/e112122/my.cnf

 !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