database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

test.cnf files should !include default_my.cnf

Browse Source 
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
This commit is contained in:
Sergei Golubchik
2023-08-30 10:00:30 +02:00
parent ec5403ffb3
commit d7699c51eb
115 changed files with 115 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/include/default_my.cnf
View File

@ -27,9 +27,6 @@
# Run tests with the performance schema instrumentation # Run tests with the performance schema instrumentation
loose-enable-performance-schema loose-enable-performance-schema
[mysqlbinlog]
disable-force-if-open
[ENV] [ENV]
MASTER_MYPORT= @mysqld.1.port MASTER_MYPORT= @mysqld.1.port
MASTER_MYSOCK= @mysqld.1.socket MASTER_MYSOCK= @mysqld.1.socket

2
mysql-test/main/mysqlbinlog.test
View File

@ -335,7 +335,7 @@ exec $MYSQL_BINLOG $MYSQL_TEST_DIR/std_data/corrupt-relay-bin.000624 > $MYSQLTES
FLUSH LOGS; FLUSH LOGS;
--error 1 --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 --exec $MYSQL_BINLOG --force-if-open $MYSQLD_DATADIR/master-bin.000017 >/dev/null 2>/dev/null
--echo Bug#31611 Security risk with BINLOG statement --echo Bug#31611 Security risk with BINLOG statement

3
mysql-test/suite/binlog_encryption/my.cnf
View File

@ -1,5 +1,4 @@
!include include/default_mysqld.cnf !include include/default_my.cnf
!include include/default_client.cnf
[mysqld.1] [mysqld.1]
innodb innodb

3
mysql-test/suite/federated/my.cnf
View File

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

2
mysql-test/suite/galera/galera_2nodes.cnf
View File

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

2
mysql-test/suite/galera/galera_2nodes_as_master.cnf
View File

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

2
mysql-test/suite/galera/galera_2nodes_as_slave.cnf
View File

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

2
mysql-test/suite/galera/galera_2x2nodes.cnf
View File

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

2
mysql-test/suite/galera/galera_3nodes_as_slave.cnf
View File

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

2
mysql-test/suite/galera/galera_4nodes.cnf
View File

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

2
mysql-test/suite/galera_3nodes/galera_2x3nodes.cnf
View File

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

2
mysql-test/suite/galera_3nodes/galera_3nodes.cnf
View File

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

2
mysql-test/suite/mariabackup/slave_provision_nolock.cnf
View File

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

3
mysql-test/suite/multi_source/my.cnf
View File

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

2
mysql-test/suite/perfschema/t/cnf_option.cnf
View File

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

3
mysql-test/suite/rpl/rpl_1slave_base.cnf
View File

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

3
mysql-test/suite/rpl/t/rpl_ip_mix.cnf
View File

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

3
mysql-test/suite/rpl/t/rpl_ip_mix2.cnf
View File

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

3
mysql-test/suite/rpl/t/rpl_ipv4_as_ipv6.cnf
View File

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

3
mysql-test/suite/rpl/t/rpl_ipv6.cnf
View File

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

2
mysql-test/suite/rpl/t/rpl_row_img.cnf
View File

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

2
mysql-test/suite/rpl/t/rpl_row_img_sequence_full.cnf
View File

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

2
mysql-test/suite/rpl/t/rpl_row_img_sequence_full_nodup.cnf
View File

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

2
mysql-test/suite/rpl/t/rpl_row_img_sequence_min.cnf
View File

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

2
mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.cnf
View File

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

2
mysql-test/suite/rpl/t/rpl_xa_empty_transaction.cnf
View File

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

3
mysql-test/suite/s3/my.cnf
View File

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

2
mysql-test/suite/sys_vars/t/slave_parallel_threads_basic.cnf
View File

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

2
mysql-test/suite/wsrep/my.cnf
View File

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

2
mysql-test/suite/wsrep/t/alter_table_innodb.cnf
View File

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

2
mysql-test/suite/wsrep/t/mdev_10186.cnf
View File

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

2
mysql-test/suite/wsrep/t/wsrep_provider_plugin_wsrep_off.cnf
View File

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

2
mysql-test/suite/wsrep/t/wsrep_variables_wsrep_off.cnf
View File

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

2
plugin/wsrep_info/mysql-test/wsrep_info/my.cnf
View File

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

3
storage/connect/mysql-test/connect/my.cnf
View File

@ -1,6 +1,5 @@
# Use default setting for mysqld processes # Use default setting for mysqld processes
!include include/default_mysqld.cnf !include include/default_my.cnf
!include include/default_client.cnf
[mysqld.1] [mysqld.1]
#log-bin= master-bin #log-bin= master-bin

3
storage/rocksdb/mysql-test/rocksdb_hotbackup/base.cnf
View File

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

3
storage/rocksdb/mysql-test/rocksdb_rpl/rpl_1slave_base.cnf
View File

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

2
storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_missing_columns_sk_update.cnf
View File

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

1
storage/spider/mysql-test/spider/bg/my.cnf
View File

@ -1,5 +1,6 @@
# Use default setting for mysqld processes # Use default setting for mysqld processes
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
[mysqld.1.1] [mysqld.1.1]
loose_handlersocket_port= 20000 loose_handlersocket_port= 20000

1
storage/spider/mysql-test/spider/bugfix/my.cnf
View File

@ -1,2 +1,3 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include my_1_1.cnf !include my_1_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/checksum_table_with_quick_mode_3.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/cp932_column.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_default.cnf
View File

@ -1,4 +1,5 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf
!include ../my_4_1.cnf !include ../my_4_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_mariadb.cnf
View File

@ -1,4 +1,5 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf
!include ../my_4_1.cnf !include ../my_4_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_mysql.cnf
View File

@ -1,4 +1,5 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf
!include ../my_4_1.cnf !include ../my_4_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/direct_sql_with_comma_pwd.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/direct_sql_with_tmp_table.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/gbh_outer_fields_in_join.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/group_by_order_by_limit.cnf
View File

@ -1,4 +1,5 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf
!include ../my_2_2.cnf !include ../my_2_2.cnf

1
storage/spider/mysql-test/spider/bugfix/t/insert_select.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_19866.cnf
View File

@ -1,4 +1,5 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf
!include ../my_2_2.cnf !include ../my_2_2.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_20100.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_20502.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_21884.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_22246.cnf
View File

@ -1,4 +1,5 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf
!include ../my_2_2.cnf !include ../my_2_2.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_22265.cnf
View File

@ -1,2 +1,3 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_24020.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_24343.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_24517.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_24523.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_24760.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_25116.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_25684.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_26013.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_26158.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_26247.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_26539.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_26544.cnf
View File

@ -1,2 +1,3 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_26582.cnf
View File

@ -1,2 +1,3 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_27172.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_27184.cnf
View File

@ -1,2 +1,3 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_27239.cnf
View File

@ -1,2 +1,3 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_27240.cnf
View File

@ -1,2 +1,3 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_28739.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_28854.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_28996.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_29008.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_29011.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_29447.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_29484.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_29562.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_29644.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_29653.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_29667.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_30191.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/mdev_31463.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/quick_mode_0.cnf
View File

@ -1,4 +1,5 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf
!include ../my_2_2.cnf !include ../my_2_2.cnf

1
storage/spider/mysql-test/spider/bugfix/t/quick_mode_1.cnf
View File

@ -1,4 +1,5 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf
!include ../my_2_2.cnf !include ../my_2_2.cnf

1
storage/spider/mysql-test/spider/bugfix/t/quick_mode_2.cnf
View File

@ -1,4 +1,5 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf
!include ../my_2_2.cnf !include ../my_2_2.cnf

1
storage/spider/mysql-test/spider/bugfix/t/quick_mode_3.cnf
View File

@ -1,4 +1,5 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf
!include ../my_2_2.cnf !include ../my_2_2.cnf

1
storage/spider/mysql-test/spider/bugfix/t/return_found_rows_insert.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/return_found_rows_update.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/same_server_link.cnf
View File

@ -1,2 +1,3 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/select_by_null.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/select_with_backquote.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/self_reference.cnf
View File

@ -1,2 +1,3 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/slave_transaction_retry_errors_5digit.cnf
View File

@ -1,4 +1,5 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf
!include ../my_4_1.cnf !include ../my_4_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/slave_trx_isolation.cnf
View File

@ -1,4 +1,5 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf
!include ../my_4_1.cnf !include ../my_4_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/sql_mode_mariadb.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

1
storage/spider/mysql-test/spider/bugfix/t/sql_mode_mysql.cnf
View File

@ -1,3 +1,4 @@
!include include/default_mysqld.cnf !include include/default_mysqld.cnf
!include include/default_client.cnf
!include ../my_1_1.cnf !include ../my_1_1.cnf
!include ../my_2_1.cnf !include ../my_2_1.cnf

Some files were not shown because too many files have changed in this diff Show More