diff options
Diffstat (limited to 'mysql-test/r/grant2.result')
| -rw-r--r-- | mysql-test/r/grant2.result | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result index 95748c89103..7c2023127f0 100644 --- a/mysql-test/r/grant2.result +++ b/mysql-test/r/grant2.result @@ -348,15 +348,14 @@ create database TESTDB; create table t2(a int); create temporary table t1 as select * from mysql.user; delete from mysql.user where host='localhost'; -INSERT INTO mysql.user VALUES -('%','mysqltest_1',password('password'),'N','N','N','N','N','N', -'N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N', -'','','','',0,0,0,0); -INSERT INTO mysql.db VALUES -('%','TESTDB','mysqltest_1','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','N','Y','Y','Y',' -Y','N'); +INSERT INTO mysql.user (host, user, password) VALUES +('%','mysqltest_1',password('password')); Warnings: -Warning 1265 Data truncated for column 'Alter_routine_priv' at row 1 +Warning 1364 Field 'ssl_cipher' doesn't have a default value +Warning 1364 Field 'x509_issuer' doesn't have a default value +Warning 1364 Field 'x509_subject' doesn't have a default value +INSERT INTO mysql.db (host, db, user, select_priv) VALUES +('%','TESTDB','mysqltest_1','Y'); FLUSH PRIVILEGES; create database TEStdb; Got one of the listed errors @@ -366,6 +365,8 @@ insert into mysql.user select * from t1; drop table t1, t2; drop database TESTDB; flush privileges; +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; +SET GLOBAL log_bin_trust_function_creators = 1; GRANT ALL PRIVILEGES ON test.* TO `a@`@localhost; GRANT EXECUTE ON * TO `a@`@localhost; CREATE TABLE t2 (s1 INT); @@ -380,6 +381,7 @@ DROP FUNCTION f2; DROP TABLE t2; REVOKE ALL PRIVILEGES, GRANT OPTION FROM `a@`@localhost; DROP USER `a@`@localhost; +SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; drop database if exists mysqltest_1; drop database if exists mysqltest_2; drop user mysqltest_u1@localhost; @@ -396,7 +398,7 @@ grant select on mysqltest_2.t1 to mysqltest_u1@localhost; show create table mysqltest_2.t1; Table Create Table t1 CREATE TABLE `t1` ( - `i` int(11) default NULL + `i` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 create table t1 like mysqltest_2.t1; use test; @@ -433,7 +435,7 @@ USE db1; SELECT c FROM t2; ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2' SELECT * FROM t2; -ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2' +ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for table 't2' SELECT * FROM t1 JOIN t2 USING (b); ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2' USE test; |