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

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Monty
2019-09-02 14:06:56 +03:00
parent b0ff5a6a73 9cba6c5aa3
commit a071e0e029
671 changed files with 11116 additions and 14190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/plugins/r/qc_info.result
View File

@ -1,3 +1,4 @@
set @save_query_cache_size=@@global.query_cache_size;
set global query_cache_type=ON;
set local query_cache_type=ON;
set global query_cache_size=1355776;
@ -55,3 +56,4 @@ show query_cache_info;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_info' at line 1
flush query_cache_info;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_info' at line 1
set @@global.query_cache_size=@save_query_cache_size;

3
mysql-test/suite/plugins/r/qc_info_priv.result
View File

@ -1,3 +1,4 @@
set @save_query_cache_size=@@global.query_cache_size;
set global query_cache_type=ON;
set local query_cache_type=ON;
set global query_cache_size=1355776;
@ -43,5 +44,5 @@ count(*)
connection default;
drop user mysqltest;
drop table t1;
set global query_cache_size= default;
set @@global.query_cache_size=@save_query_cache_size;
set global query_cache_type=default;

2
mysql-test/suite/plugins/t/feedback_plugin_load.test
View File

@ -1,4 +1,4 @@
if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'feedback' and plugin_status='active'`)
if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'feedback' and plugin_status='active' and @@feedback_url <> ""`)
{
--skip Feedback plugin is not active
}

3
mysql-test/suite/plugins/t/qc_info.test
View File

@ -1,3 +1,5 @@
set @save_query_cache_size=@@global.query_cache_size;
--source include/default_charset.inc
--source qc_info_init.inc
# test that hits are correctly incremented
@ -21,3 +23,4 @@ show query_cache_info;
--error ER_PARSE_ERROR
flush query_cache_info;
set @@global.query_cache_size=@save_query_cache_size;

1
mysql-test/suite/plugins/t/qc_info_init.inc
View File

@ -32,4 +32,3 @@ set time_zone= @time_zone, default_week_format= @default_week_format, character_
--sorted_result
--replace_column 5 # 19 # 23 #
select * from information_schema.query_cache_info;

3
mysql-test/suite/plugins/t/qc_info_priv.test
View File

@ -1,3 +1,4 @@
set @save_query_cache_size=@@global.query_cache_size;
--source include/not_embedded.inc
--source qc_info_init.inc
@ -11,5 +12,5 @@ connection default;
drop user mysqltest;
drop table t1;
set global query_cache_size= default;
set @@global.query_cache_size=@save_query_cache_size;
set global query_cache_type=default;