database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge with MariaDB 5.1

Browse Source
This commit is contained in:
Michael Widenius
2010-07-17 01:57:55 +03:00
parent 178f18467e 24c08f5279
commit f58199f6f6
8 changed files with 186 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/federated/federated_server.result
View File

@@ -213,7 +213,7 @@ id name
alter server s1 options (database 'db_bogus');
flush tables;
select * from federated.t1;
ERROR HY000: There was a problem processing the query on the foreign data source. Data source error: : 1044 : Access denied for user 'test_fed'@'localhost' to databa
ERROR 42000: Got error: 1044 : Access denied for user 'test_fed'@'localhost' to database 'db_bogus'
drop server if exists 's1';
ERROR 42000: Access denied; you need the SUPER privilege for this operation
create server 's1' foreign data wrapper 'mysql' options

2
mysql-test/suite/federated/federated_server.test
View File

@@ -239,7 +239,7 @@ alter server s1 options (database 'db_bogus');
connection master;
flush tables;
--error ER_QUERY_ON_FOREIGN_DATA_SOURCE
--error ER_DBACCESS_DENIED_ERROR
select * from federated.t1;
connection conn_select;

8
mysql-test/suite/maria/r/optimize.result Normal file
View File

@@ -0,0 +1,8 @@
drop table if exists t1;
check table t1;
Table Op Msg_type Msg_text
test.t1 check status OK
OPTIMIZE TABLE t1;
Table Op Msg_type Msg_text
test.t1 optimize status OK
drop table t1;

162
mysql-test/suite/maria/t/optimize.test Normal file
View File

File diff suppressed because one or more lines are too long