diff options
| author | unknown <monty@mysql.com> | 2005-01-04 13:23:04 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-01-04 13:23:04 +0200 |
| commit | 6d0443331ac989415b71adc795c8850a7b19dd98 (patch) | |
| tree | 3d99196c45291a86d16eaf701f69e57d506b42a9 /mysql-test/t/multi_update.test | |
| parent | 11f9b67134a4d751c313a66faaf02833b0d63d88 (diff) | |
| parent | 68114c03f7bee53303f58bbc3352ee5b8fad76f8 (diff) | |
| download | mariadb-git-6d0443331ac989415b71adc795c8850a7b19dd98.tar.gz | |
Merge
mysql-test/t/multi_update.test:
Auto merged
sql/sql_table.cc:
Auto merged
support-files/mysql.spec.sh:
SCCS merged
Diffstat (limited to 'mysql-test/t/multi_update.test')
| -rw-r--r-- | mysql-test/t/multi_update.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test index bc82de50f6f..f3b6216e3cf 100644 --- a/mysql-test/t/multi_update.test +++ b/mysql-test/t/multi_update.test @@ -6,9 +6,9 @@ drop table if exists t1,t2,t3; drop database if exists mysqltest; drop view if exists v1; ---error 0,1141 +--error 0,1141,1147 revoke all privileges on mysqltest.t1 from mysqltest_1@localhost; ---error 0,1141 +--error 0,1141,1147 revoke all privileges on mysqltest.* from mysqltest_1@localhost; delete from mysql.user where user=_binary'mysqltest_1'; --enable_warnings |