diff --git a/mysql-test/include/default_my.cnf b/mysql-test/include/default_my.cnf index a1c427fe12c..c4c9890033c 100644 --- 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 index 9394ca3fbd3..3d2646f73e1 100644 --- 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 index d787ebe1d4c..f0fbca7b23e 100644 --- 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 index b97f8266ff1..21fd1b391d2 100644 --- 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 index 3532c1f2134..eefb94522fe 100644 --- 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 index ba53d6062c1..28970d05807 100644 --- 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 index f25c7cc6d48..dbf1544df43 100644 --- 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 index 922906eac6f..0311ff09eb7 100644 --- 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 index 0ecf877b5a3..79b498868ad 100644 --- 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 index 66238a8e4c2..a4b02f1513d 100644 --- 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 index cd7a892f4c9..56da3150792 100644 --- 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 index a7dd4d21bc7..d43f1373ed3 100644 --- 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 index 0e0bbd63f39..d8326a5ccb8 100644 --- 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 index d98e6b62e29..c4268848a33 100644 --- 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 index d24593235da..31bc901bf88 100644 --- 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 index a7a7f5c6218..c1e9e82861c 100644 --- 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 index 00e2637d822..195bc57cac7 100644 --- 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 index 306df437bcc..5a247cbed46 100644 --- 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 index b646a4088ff..ce31d05fc46 100644 --- 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 index 6bf97a94a4e..52b2a80a892 100644 --- 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 index ed9a4292917..62b5c99c49b 100644 --- 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 index 7104b4e4502..7d48e44194a 100644 --- 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 index 7104b4e4502..7d48e44194a 100644 --- 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 index 7104b4e4502..7d48e44194a 100644 --- 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 index 7104b4e4502..7d48e44194a 100644 --- 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 index 92acd0c73a6..261852a4e9d 100644 --- 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 index f851aa18d6d..818b2a881d6 100644 --- 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 index 02bdb44e1de..08af82e15ba 100644 --- 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 index e35f73f46c1..668d09b5ce4 100644 --- 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 index d8e27463cc1..f757621b3e6 100644 --- 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 index 284c887648e..035565fca9a 100644 --- 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 index 53c12cc4dab..cd129a29f36 100644 --- 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 index 2e66b1ef23c..23b1392e4b1 100644 --- 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 index 8f62cfd0cc9..5adf6313843 100644 --- 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 index 6310772d01f..0e03abae306 100644 --- 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 index 101dbce2385..1a03c58a9fe 100644 --- 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 index ed8c77bcc0b..32be7f58dc2 100644 --- 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 index 92ed71986fe..b7ad3a73868 100644 --- 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 index 246099c623e..ef9a042ca11 100644 --- 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 index b7f76a630cc..d34c836d57c 100644 --- 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 index 05dfd8a0bce..bd19b855dff 100644 --- 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 index 05dfd8a0bce..bd19b855dff 100644 --- 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 index 45019d6c537..7c33a8afec0 100644 --- 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 index 45019d6c537..7c33a8afec0 100644 --- 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 index 45019d6c537..7c33a8afec0 100644 --- 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 index 05dfd8a0bce..bd19b855dff 100644 --- 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 index 05dfd8a0bce..bd19b855dff 100644 --- 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 index 05dfd8a0bce..bd19b855dff 100644 --- 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 index e0ffb99c38e..377924981fe 100644 --- 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 index 05dfd8a0bce..bd19b855dff 100644 --- 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 index e0ffb99c38e..377924981fe 100644 --- 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 index 05dfd8a0bce..bd19b855dff 100644 --- 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 index 05dfd8a0bce..bd19b855dff 100644 --- 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 index 05dfd8a0bce..bd19b855dff 100644 --- 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 index e0ffb99c38e..377924981fe 100644 --- 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 index b0853e32654..0ef6f319d42 100644 --- 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 index 05dfd8a0bce..bd19b855dff 100644 --- 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 index 05dfd8a0bce..bd19b855dff 100644 --- 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 index 05dfd8a0bce..bd19b855dff 100644 --- 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 index 05dfd8a0bce..bd19b855dff 100644 --- 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 index 05dfd8a0bce..bd19b855dff 100644 --- 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 diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_25116.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_25116.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_25116.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_25116.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_25684.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_25684.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_25684.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_25684.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_26013.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_26013.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_26013.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_26013.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_26158.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_26158.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_26158.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_26158.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_26247.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_26247.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_26247.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_26247.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_26539.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_26539.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_26539.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_26539.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_26544.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_26544.cnf index b0853e32654..0ef6f319d42 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_26544.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_26544.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_26582.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_26582.cnf index b0853e32654..0ef6f319d42 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_26582.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_26582.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_27172.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_27172.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_27172.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_27172.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_27184.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_27184.cnf index b0853e32654..0ef6f319d42 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_27184.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_27184.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_27239.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_27239.cnf index b0853e32654..0ef6f319d42 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_27239.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_27239.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_27240.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_27240.cnf index b0853e32654..0ef6f319d42 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_27240.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_27240.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_28739.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_28739.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_28739.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_28739.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_28854.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_28854.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_28854.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_28854.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_28996.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_28996.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_28996.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_28996.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_29008.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_29008.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_29008.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_29008.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_29011.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_29011.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_29011.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_29011.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_29447.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_29447.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_29447.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_29447.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_29484.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_29484.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_29484.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_29484.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_29562.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_29562.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_29562.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_29562.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_29644.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_29644.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_29644.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_29644.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_29653.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_29653.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_29653.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_29653.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_29667.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_29667.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_29667.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_29667.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_30191.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_30191.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_30191.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_30191.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_31463.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_31463.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_31463.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_31463.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/quick_mode_0.cnf b/storage/spider/mysql-test/spider/bugfix/t/quick_mode_0.cnf index e0ffb99c38e..377924981fe 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/quick_mode_0.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/quick_mode_0.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/quick_mode_1.cnf b/storage/spider/mysql-test/spider/bugfix/t/quick_mode_1.cnf index e0ffb99c38e..377924981fe 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/quick_mode_1.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/quick_mode_1.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/quick_mode_2.cnf b/storage/spider/mysql-test/spider/bugfix/t/quick_mode_2.cnf index e0ffb99c38e..377924981fe 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/quick_mode_2.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/quick_mode_2.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/quick_mode_3.cnf b/storage/spider/mysql-test/spider/bugfix/t/quick_mode_3.cnf index e0ffb99c38e..377924981fe 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/quick_mode_3.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/quick_mode_3.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/return_found_rows_insert.cnf b/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_insert.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_insert.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_insert.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/return_found_rows_update.cnf b/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_update.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_update.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_update.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/same_server_link.cnf b/storage/spider/mysql-test/spider/bugfix/t/same_server_link.cnf index b0853e32654..0ef6f319d42 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/same_server_link.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/same_server_link.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/select_by_null.cnf b/storage/spider/mysql-test/spider/bugfix/t/select_by_null.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/select_by_null.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/select_by_null.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/select_with_backquote.cnf b/storage/spider/mysql-test/spider/bugfix/t/select_with_backquote.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/select_with_backquote.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/select_with_backquote.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/self_reference.cnf b/storage/spider/mysql-test/spider/bugfix/t/self_reference.cnf index b0853e32654..0ef6f319d42 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/self_reference.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/self_reference.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/slave_transaction_retry_errors_5digit.cnf b/storage/spider/mysql-test/spider/bugfix/t/slave_transaction_retry_errors_5digit.cnf index c861d27b01d..f267ad519c8 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/slave_transaction_retry_errors_5digit.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/slave_transaction_retry_errors_5digit.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/slave_trx_isolation.cnf b/storage/spider/mysql-test/spider/bugfix/t/slave_trx_isolation.cnf index 45019d6c537..7c33a8afec0 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/slave_trx_isolation.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/slave_trx_isolation.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/sql_mode_mariadb.cnf b/storage/spider/mysql-test/spider/bugfix/t/sql_mode_mariadb.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/sql_mode_mariadb.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/sql_mode_mariadb.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/sql_mode_mysql.cnf b/storage/spider/mysql-test/spider/bugfix/t/sql_mode_mysql.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/sql_mode_mysql.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/sql_mode_mysql.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/strict_group_by.cnf b/storage/spider/mysql-test/spider/bugfix/t/strict_group_by.cnf index e0ffb99c38e..377924981fe 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/strict_group_by.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/strict_group_by.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/udf_mysql_func_early.cnf b/storage/spider/mysql-test/spider/bugfix/t/udf_mysql_func_early.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/udf_mysql_func_early.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/udf_mysql_func_early.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/udf_mysql_func_early_init_file.cnf b/storage/spider/mysql-test/spider/bugfix/t/udf_mysql_func_early_init_file.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/udf_mysql_func_early_init_file.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/udf_mysql_func_early_init_file.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/wait_timeout.cnf b/storage/spider/mysql-test/spider/bugfix/t/wait_timeout.cnf index e0ffb99c38e..377924981fe 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/wait_timeout.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/wait_timeout.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/wrapper_mariadb.cnf b/storage/spider/mysql-test/spider/bugfix/t/wrapper_mariadb.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/wrapper_mariadb.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/wrapper_mariadb.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/xa_cmd.cnf b/storage/spider/mysql-test/spider/bugfix/t/xa_cmd.cnf index 05dfd8a0bce..bd19b855dff 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/xa_cmd.cnf +++ b/storage/spider/mysql-test/spider/bugfix/t/xa_cmd.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/feature/my.cnf b/storage/spider/mysql-test/spider/feature/my.cnf index b7f76a630cc..d34c836d57c 100644 --- a/storage/spider/mysql-test/spider/feature/my.cnf +++ b/storage/spider/mysql-test/spider/feature/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/feature/t/checksum_table_parallel_extended.cnf b/storage/spider/mysql-test/spider/feature/t/checksum_table_parallel_extended.cnf index e0ffb99c38e..377924981fe 100644 --- a/storage/spider/mysql-test/spider/feature/t/checksum_table_parallel_extended.cnf +++ b/storage/spider/mysql-test/spider/feature/t/checksum_table_parallel_extended.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/feature/t/checksum_table_parallel_no_opt.cnf b/storage/spider/mysql-test/spider/feature/t/checksum_table_parallel_no_opt.cnf index e0ffb99c38e..377924981fe 100644 --- a/storage/spider/mysql-test/spider/feature/t/checksum_table_parallel_no_opt.cnf +++ b/storage/spider/mysql-test/spider/feature/t/checksum_table_parallel_no_opt.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/feature/t/checksum_table_parallel_quick.cnf b/storage/spider/mysql-test/spider/feature/t/checksum_table_parallel_quick.cnf index e0ffb99c38e..377924981fe 100644 --- a/storage/spider/mysql-test/spider/feature/t/checksum_table_parallel_quick.cnf +++ b/storage/spider/mysql-test/spider/feature/t/checksum_table_parallel_quick.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/feature/t/engine_defined_attributes.cnf b/storage/spider/mysql-test/spider/feature/t/engine_defined_attributes.cnf index e0ffb99c38e..377924981fe 100644 --- a/storage/spider/mysql-test/spider/feature/t/engine_defined_attributes.cnf +++ b/storage/spider/mysql-test/spider/feature/t/engine_defined_attributes.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/feature/t/slave_transaction_retry_errors.cnf b/storage/spider/mysql-test/spider/feature/t/slave_transaction_retry_errors.cnf index 45019d6c537..7c33a8afec0 100644 --- a/storage/spider/mysql-test/spider/feature/t/slave_transaction_retry_errors.cnf +++ b/storage/spider/mysql-test/spider/feature/t/slave_transaction_retry_errors.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/my.cnf b/storage/spider/mysql-test/spider/my.cnf index db4f7656fbc..2f597ec8d83 100644 --- a/storage/spider/mysql-test/spider/my.cnf +++ b/storage/spider/mysql-test/spider/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] log-bin= master-bin diff --git a/storage/spider/mysql-test/spider/regression/e1121/my.cnf b/storage/spider/mysql-test/spider/regression/e1121/my.cnf index 47558d85fc6..39569f384cc 100644 --- a/storage/spider/mysql-test/spider/regression/e1121/my.cnf +++ b/storage/spider/mysql-test/spider/regression/e1121/my.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/regression/e112122/my.cnf b/storage/spider/mysql-test/spider/regression/e112122/my.cnf index 6610e4cfd98..47e82b1f37d 100644 --- a/storage/spider/mysql-test/spider/regression/e112122/my.cnf +++ b/storage/spider/mysql-test/spider/regression/e112122/my.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