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.1' of https://github.com/MariaDB/server into ok-debpkg-10.1

Browse Source
This commit is contained in:
Otto Kekäläinen
2015-09-05 21:28:14 +03:00
parent b9fee60871 67dbfab3d7
commit d6c5e7e2cc
943 changed files with 17455 additions and 9230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/plugins/r/audit_null.result
View File

@ -1,5 +1,6 @@
set @old_global_general_log=@@global.general_log;
set global general_log=OFF;
create user testuser@localhost;
grant select on *.* to testuser@localhost;
install plugin audit_null soname 'adt_null';
select 1;

1
mysql-test/suite/plugins/r/auth_v0100.result
View File

@ -5,6 +5,7 @@ auth_0x0100 1.0
mysql_native_password 2.0
mysql_old_password 2.0
create user tt identified via auth_0x0100;
create user zzzzzzzzzzzzzzzz;
grant select on test.* to zzzzzzzzzzzzzzzz;
connect(localhost,tt,,test,MASTER_MYPORT,MASTER_MYSOCK);
ERROR 28000: Access denied for user 'tt'@'localhost' (using password: YES)

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

@ -1,3 +1,5 @@
set global query_cache_type=ON;
set local query_cache_type=ON;
set global query_cache_size=1355776;
create table t1 (a int not null);
insert into t1 values (1),(2),(3);
@ -16,6 +18,7 @@ set global query_cache_size = 0;
select * from information_schema.query_cache_info;
STATEMENT_SCHEMA STATEMENT_TEXT RESULT_BLOCKS_COUNT RESULT_BLOCKS_SIZE RESULT_BLOCKS_SIZE_USED
set global query_cache_size= default;
set global query_cache_type=default;
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;

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

@ -1,3 +1,5 @@
set global query_cache_type=ON;
set local query_cache_type=ON;
set global query_cache_size=1355776;
create table t1 (a int not null);
insert into t1 values (1),(2),(3);
@ -21,3 +23,4 @@ count(*)
drop user mysqltest;
drop table t1;
set global query_cache_size= default;
set global query_cache_type=default;