Commit 26dab541 authored by unknown's avatar unknown
Browse files

Merge 5.0 -> 5.1 


mysql-test/r/grant2.result:
  Update test result
mysql-test/t/grant2.test:
  Explicitly specify "columns" when inserting into mysql.user and mysql.db
parent bab96216

mysql-test/r/grant2.result

+7 −8
Original line number Diff line number Diff line
@@ -338,15 +338,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;

ERROR 42000: Access denied for user 'mysqltest_1'@'%' to database 'TEStdb'

mysql-test/t/grant2.test

+4 −7
Original line number Diff line number Diff line
@@ -439,13 +439,10 @@ 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'));

INSERT INTO mysql.db (host, db, user, select_priv) VALUES

('%','TESTDB','mysqltest_1','Y');

FLUSH PRIVILEGES;



connect (con1,localhost,mysqltest_1,password,TESTDB);