diff options
| author | unknown <pem@mysql.com> | 2006-03-03 12:03:27 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2006-03-03 12:03:27 +0100 |
| commit | 5a78cd7a7294f7a930389874f64d6c252f485704 (patch) | |
| tree | e2df16ff96563c43b76904332f584b344892a56f /mysql-test/r/grant2.result | |
| parent | 104b9e789a60c8881e6e82cbbf7b8d919ff1bbf1 (diff) | |
| parent | e2ba74b8252586bd27ace8603aab33c76b2b50cd (diff) | |
| download | mariadb-git-5a78cd7a7294f7a930389874f64d6c252f485704.tar.gz | |
Merge mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/skip_grants.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field_conv.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
VC++Files/mysql.sln:
Manual merge (use local).
configure.in:
Manual merge.
sql/table.cc:
Manual merge.
Diffstat (limited to 'mysql-test/r/grant2.result')
| -rw-r--r-- | mysql-test/r/grant2.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result index fd3eca56b31..6c6e0f19e08 100644 --- a/mysql-test/r/grant2.result +++ b/mysql-test/r/grant2.result @@ -348,7 +348,7 @@ 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' +Got one of the listed errors delete from mysql.user; delete from mysql.db where host='%' and user='mysqltest_1' and db='TESTDB'; insert into mysql.user select * from t1; |