mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
post-merge fix
mysql-test/r/information_schema.result: Auto merged mysql-test/r/lowercase_table2.result: Auto merged sql/item_strfunc.h: Auto merged sql/sql_show.cc: Auto merged mysql-test/t/information_schema.test: manual merge
This commit is contained in:
@ -580,28 +580,32 @@ connect (con2,localhost,user2,,mysqltest);
|
||||
connect (con3,localhost,user3,,mysqltest);
|
||||
connect (con4,localhost,user4,,);
|
||||
connection con1;
|
||||
select * from information_schema.column_privileges;
|
||||
select * from information_schema.table_privileges;
|
||||
select * from information_schema.schema_privileges;
|
||||
select * from information_schema.user_privileges;
|
||||
select * from information_schema.column_privileges order by grantee;
|
||||
select * from information_schema.table_privileges order by grantee;
|
||||
select * from information_schema.schema_privileges order by grantee;
|
||||
select * from information_schema.user_privileges order by grantee;
|
||||
show grants;
|
||||
connection con2;
|
||||
select * from information_schema.column_privileges;
|
||||
select * from information_schema.table_privileges;
|
||||
select * from information_schema.schema_privileges;
|
||||
select * from information_schema.user_privileges;
|
||||
select * from information_schema.column_privileges order by grantee;
|
||||
select * from information_schema.table_privileges order by grantee;
|
||||
select * from information_schema.schema_privileges order by grantee;
|
||||
select * from information_schema.user_privileges order by grantee;
|
||||
show grants;
|
||||
connection con3;
|
||||
select * from information_schema.column_privileges;
|
||||
select * from information_schema.table_privileges;
|
||||
select * from information_schema.schema_privileges;
|
||||
select * from information_schema.user_privileges;
|
||||
select * from information_schema.column_privileges order by grantee;
|
||||
select * from information_schema.table_privileges order by grantee;
|
||||
select * from information_schema.schema_privileges order by grantee;
|
||||
select * from information_schema.user_privileges order by grantee;
|
||||
show grants;
|
||||
connection con4;
|
||||
select * from information_schema.column_privileges where grantee like '%user%';
|
||||
select * from information_schema.table_privileges where grantee like '%user%';
|
||||
select * from information_schema.schema_privileges where grantee like '%user%';
|
||||
select * from information_schema.user_privileges where grantee like '%user%';
|
||||
select * from information_schema.column_privileges where grantee like '%user%'
|
||||
order by grantee;
|
||||
select * from information_schema.table_privileges where grantee like '%user%'
|
||||
order by grantee;
|
||||
select * from information_schema.schema_privileges where grantee like '%user%'
|
||||
order by grantee;
|
||||
select * from information_schema.user_privileges where grantee like '%user%'
|
||||
order by grantee;
|
||||
show grants;
|
||||
connection default;
|
||||
drop user user1@localhost, user2@localhost, user3@localhost, user4@localhost;
|
||||
@ -824,25 +828,6 @@ select routine_name from information_schema.routines;
|
||||
delete from proc where name='';
|
||||
use test;
|
||||
|
||||
#
|
||||
# End of 5.0 tests.
|
||||
#
|
||||
# Show engines
|
||||
#
|
||||
|
||||
select * from information_schema.engines WHERE ENGINE="MyISAM";
|
||||
|
||||
#
|
||||
# INFORMATION_SCHEMA.PROCESSLIST
|
||||
#
|
||||
|
||||
grant select on *.* to user3148@localhost;
|
||||
connect (con3148,localhost,user3148,,test);
|
||||
connection con3148;
|
||||
select user,db from information_schema.processlist;
|
||||
connection default;
|
||||
drop user user3148@localhost;
|
||||
|
||||
#
|
||||
# Bug#16681 information_schema shows forbidden VIEW details
|
||||
#
|
||||
@ -862,3 +847,31 @@ drop view v1, v2;
|
||||
drop table t1;
|
||||
drop user mysqltest_1@localhost;
|
||||
|
||||
#
|
||||
# Bug#19599 duplication of information_schema column value in a CONCAT expr with user var
|
||||
#
|
||||
set @a:= '.';
|
||||
create table t1(f1 char(5));
|
||||
create table t2(f1 char(5));
|
||||
select concat(@a, table_name), @a, table_name
|
||||
from information_schema.tables where table_schema = 'test';
|
||||
drop table t1,t2;
|
||||
|
||||
# End of 5.0 tests.
|
||||
#
|
||||
# Show engines
|
||||
#
|
||||
|
||||
select * from information_schema.engines WHERE ENGINE="MyISAM";
|
||||
|
||||
#
|
||||
# INFORMATION_SCHEMA.PROCESSLIST
|
||||
#
|
||||
|
||||
grant select on *.* to user3148@localhost;
|
||||
connect (con3148,localhost,user3148,,test);
|
||||
connection con3148;
|
||||
select user,db from information_schema.processlist;
|
||||
connection default;
|
||||
drop user user3148@localhost;
|
||||
|
||||
|
Reference in New Issue
Block a user