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

Updated mtr files to support different compiled in options

Browse Source 
This allows one to run the test suite even if any of the following
options are changed:
- character-set-server
- collation-server
- join-cache-level
- log-basename
- max-allowed-packet
- optimizer-switch
- query-cache-size and query-cache-type
- skip-name-resolve
- table-definition-cache
- table-open-cache
- Some innodb options
etc

Changes:
- Don't print out the value of system variables as one can't depend on
  them to being constants.
- Don't set global variables to 'default' as the default may not
  be the same as the test was started with if there was an additional
  option file. Instead save original value and reset it at end of test.
- Test that depends on the latin1 character set should include
  default_charset.inc or set the character set to latin1
- Test that depends on the original optimizer switch, should include
  default_optimizer_switch.inc
- Test that depends on the value of a specific system variable should
  set it in the test (like optimizer_use_condition_selectivity)
- Split subselect3.test into subselect3.test and subselect3.inc to
  make it easier to set and reset system variables.
- Added .opt files for test that required specfic options that could
  be changed by external configuration files.
- Fixed result files in rockdsb & tokudb that had not been updated for
  a while.
This commit is contained in:
Monty
2019-08-30 16:06:54 +03:00
parent b23b3a5fb6
commit 9cba6c5aa3
659 changed files with 11181 additions and 13214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test
View File

@ -1,4 +1,3 @@
#
# Tests for the performance_schema host_cache.
#
@ -9,6 +8,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] Host name 'santa.claus.ipv4.example.com' could not be resolved:
# Temporary failure in name resolution

1
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test
View File

@ -9,6 +9,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] Host name 'santa.claus.ipv4.example.com' could not be resolved:
# Temporary failure in name resolution

1
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test
View File

@ -9,6 +9,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] Hostname 'santa.claus.ipv4.example.com' does not resolve to '192.0.2.4'.
# [Note] Hostname 'santa.claus.ipv4.example.com' has the following IP addresses:

1
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test
View File

@ -9,6 +9,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] Hostname 'santa.claus.ipv4.example.com' does not resolve to '192.0.2.4'.
# [Note] Hostname 'santa.claus.ipv4.example.com' has the following IP addresses:

1
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test
View File

@ -9,6 +9,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] IP address '192.0.2.4' could not be resolved:
# no reverse address mapping.

1
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test
View File

@ -9,6 +9,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] IP address '192.0.2.4' could not be resolved:
# no reverse address mapping.

1
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test
View File

@ -9,6 +9,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] Host name 'santa.claus.ipv4.example.com' could not be resolved:
# Name or service not known

1
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test
View File

@ -9,6 +9,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] Host name 'santa.claus.ipv4.example.com' could not be resolved:
# Name or service not known

1
mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test
View File

@ -12,6 +12,7 @@
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_plugin_auth.inc
--source include/have_hostname_cache.inc
# Enforce a clean state
--source ../include/wait_for_pfs_thread_count.inc

1
mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test
View File

@ -11,6 +11,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# Enforce a clean state
--source ../include/wait_for_pfs_thread_count.inc

1
mysql-test/suite/perfschema/t/hostcache_ipv4_format.test
View File

@ -8,6 +8,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] IP address '192.0.2.4' could not be resolved:
# Name or service not known

1
mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test
View File

@ -11,6 +11,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# Enforce a clean state
--source ../include/wait_for_pfs_thread_count.inc

1
mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test
View File

@ -9,6 +9,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] IP address '192.0.2.4' could not be resolved:
# Temporary failure in name resolution

1
mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test
View File

@ -9,6 +9,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] IP address '192.0.2.4' could not be resolved:
# Temporary failure in name resolution

1
mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test
View File

@ -9,6 +9,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] IP address '192.0.2.4' could not be resolved:
# no reverse address mapping.

1
mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test
View File

@ -9,6 +9,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] IP address '192.0.2.4' could not be resolved:
# no reverse address mapping.

1
mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test
View File

@ -8,6 +8,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# Enforce a clean state
--source ../include/wait_for_pfs_thread_count.inc

1
mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test
View File

@ -8,6 +8,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# Enforce a clean state
--source ../include/wait_for_pfs_thread_count.inc

1
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow-master.opt
View File

@ -1 +1,2 @@
--disable-skip-name-resolve
--bind-address=::

1
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test
View File

@ -10,6 +10,7 @@
--source include/have_debug.inc
--source include/check_ipv6.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved:
# Temporary failure in name resolution

1
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny-master.opt
View File

@ -1 +1,2 @@
--disable-skip-name-resolve
--bind-address=::

1
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test
View File

@ -10,6 +10,7 @@
--source include/have_debug.inc
--source include/check_ipv6.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved:
# Temporary failure in name resolution

1
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow-master.opt
View File

@ -1 +1,2 @@
--disable-skip-name-resolve
--bind-address=::

1
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test
View File

@ -10,6 +10,7 @@
--source include/have_debug.inc
--source include/check_ipv6.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] Hostname 'santa.claus.ipv6.example.com' does not resolve to '2001:db8::6:6'.
# [Note] Hostname 'santa.claus.ipv6.example.com' has the following IP addresses:

1
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny-master.opt
View File

@ -1 +1,2 @@
--disable-skip-name-resolve
--bind-address=::

1
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test
View File

@ -10,6 +10,7 @@
--source include/have_debug.inc
--source include/check_ipv6.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] Hostname 'santa.claus.ipv6.example.com' does not resolve to '2001:db8::6:6'.
# [Note] Hostname 'santa.claus.ipv6.example.com' has the following IP addresses:

1
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow-master.opt
View File

@ -1 +1,2 @@
--disable-skip-name-resolve
--bind-address=::

1
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test
View File

@ -10,6 +10,7 @@
--source include/have_debug.inc
--source include/check_ipv6.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] IP address '192.0.2.4' could not be resolved:
# no reverse address mapping.

1
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny-master.opt
View File

@ -1 +1,2 @@
--disable-skip-name-resolve
--bind-address=::

1
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test
View File

@ -10,6 +10,7 @@
--source include/have_debug.inc
--source include/check_ipv6.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# Enforce a clean state
--source ../include/wait_for_pfs_thread_count.inc

1
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow-master.opt
View File

@ -1 +1,2 @@
--disable-skip-name-resolve
--bind-address=::

1
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test
View File

@ -10,6 +10,7 @@
--source include/have_debug.inc
--source include/check_ipv6.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved:
# Name or service not known

1
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny-master.opt
View File

@ -1 +1,2 @@
--disable-skip-name-resolve
--bind-address=::

1
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test
View File

@ -10,6 +10,7 @@
--source include/have_debug.inc
--source include/check_ipv6.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved:
# Name or service not known

1
mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin-master.opt
View File

@ -1 +1,2 @@
--disable-skip-name-resolve
--bind-address=::

1
mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test
View File

@ -12,6 +12,7 @@
--source include/have_debug.inc
--source include/check_ipv6.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
--source include/have_plugin_auth.inc
# Enforce a clean state

1
mysql-test/suite/perfschema/t/hostcache_ipv6_blocked-master.opt
View File

@ -1 +1,2 @@
--disable-skip-name-resolve
--bind-address=::

1
mysql-test/suite/perfschema/t/hostcache_ipv6_max_con-master.opt
View File

@ -1,2 +1,3 @@
--disable-skip-name-resolve
--bind-address=::
--max-user-connections=1024

5
mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test
View File

@ -12,13 +12,14 @@
--source include/have_debug.inc
--source include/check_ipv6.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# Enforce a clean state
--source ../include/wait_for_pfs_thread_count.inc
--source ../include/hostcache_set_state.inc
select @@global.max_connections into @saved_max_connections;
select @@global.max_user_connections into @saved_max_user_connections;
SET @saved_max_connections=@@global.max_connections;
SET @saved_max_user_connections=@@global.max_user_connections;
create user 'quota'@'santa.claus.ipv6.example.com';
grant select on test.* to 'quota'@'santa.claus.ipv6.example.com';

1
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow-master.opt
View File

@ -1 +1,2 @@
--disable-skip-name-resolve
--bind-address=::

1
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test
View File

@ -10,6 +10,7 @@
--source include/have_debug.inc
--source include/check_ipv6.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] IP address '2001:db8::6:6' could not be resolved:
# Temporary failure in name resolution

1
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny-master.opt
View File

@ -1 +1,2 @@
--disable-skip-name-resolve
--bind-address=::

1
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test
View File

@ -10,6 +10,7 @@
--source include/have_debug.inc
--source include/check_ipv6.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] IP address '2001:db8::6:6' could not be resolved:
# Temporary failure in name resolution

1
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow-master.opt
View File

@ -1 +1,2 @@
--disable-skip-name-resolve
--bind-address=::

1
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test
View File

@ -10,6 +10,7 @@
--source include/have_debug.inc
--source include/check_ipv6.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] IP address '2001:db8::6:6' could not be resolved:
# Name or service not known

1
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny-master.opt
View File

@ -1 +1,2 @@
--disable-skip-name-resolve
--bind-address=::

1
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test
View File

@ -10,6 +10,7 @@
--source include/have_debug.inc
--source include/check_ipv6.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# [Warning] IP address '2001:db8::6:6' could not be resolved:
# Name or service not known

1
mysql-test/suite/perfschema/t/hostcache_ipv6_passwd-master.opt
View File

@ -1 +1,2 @@
--disable-skip-name-resolve
--bind-address=::

1
mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test
View File

@ -9,6 +9,7 @@
--source include/have_debug.inc
--source include/check_ipv6.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# Enforce a clean state
--source ../include/wait_for_pfs_thread_count.inc

1
mysql-test/suite/perfschema/t/hostcache_ipv6_ssl-master.opt
View File

@ -1 +1,2 @@
--disable-skip-name-resolve
--bind-address=::

1
mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test
View File

@ -9,6 +9,7 @@
--source include/have_debug.inc
--source include/check_ipv6.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# Enforce a clean state
--source ../include/wait_for_pfs_thread_count.inc

1
mysql-test/suite/perfschema/t/hostcache_peer_addr.test
View File

@ -8,6 +8,7 @@
--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_perfschema.inc
--source include/have_hostname_cache.inc
# Enforce a clean state
--source ../include/wait_for_pfs_thread_count.inc

4
mysql-test/suite/perfschema/t/query_cache.test
View File

@ -7,6 +7,8 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
set @save_query_cache_size=@@query_cache_size;
--disable_warnings
drop table if exists t1;
--enable_warnings
@ -50,7 +52,7 @@ show status like "Qcache_queries_in_cache";
show status like "Qcache_inserts";
show status like "Qcache_hits";
SET GLOBAL query_cache_size= default;
SET GLOBAL query_cache_size=@save_query_cache_size;
drop table t1;
flush status;

2
mysql-test/suite/perfschema/t/stage_mdl_global.opt Normal file
View File

@ -0,0 +1,2 @@
--query-cache-size=1048576
--query-cache-type=OFF