diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
| commit | 567671368723c704d60902b4d0ccff951b414552 (patch) | |
| tree | 965519a5b0af3f33624c7e16fd61b58d15f42372 /mysql-test/r/sp-security.result | |
| parent | efee0608316e4cc034a3e62d05980eef8530843d (diff) | |
| parent | ceefe7bb50b17b72e88851e3b98642e89a4cddae (diff) | |
| download | mariadb-git-567671368723c704d60902b4d0ccff951b414552.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- client/mysqltest.cc
- mysql-test/collections/default.experimental
- mysql-test/suite/rpl/t/disabled.def
- sql/mysqld.cc
- sql/opt_range.cc
- sql/sp.cc
- sql/sql_acl.cc
- sql/sql_partition.cc
- sql/sql_table.cc
Diffstat (limited to 'mysql-test/r/sp-security.result')
| -rw-r--r-- | mysql-test/r/sp-security.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/sp-security.result b/mysql-test/r/sp-security.result index c45ada2047a..4ea26d1021a 100644 --- a/mysql-test/r/sp-security.result +++ b/mysql-test/r/sp-security.result @@ -349,9 +349,9 @@ CREATE FUNCTION wl2897_f1() RETURNS INT RETURN 1; ---> connection: mysqltest_1_con USE mysqltest; CREATE DEFINER=root@localhost PROCEDURE wl2897_p2() SELECT 2; -ERROR 42000: Access denied; you need the SUPER privilege for this operation +ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation CREATE DEFINER=root@localhost FUNCTION wl2897_f2() RETURNS INT RETURN 2; -ERROR 42000: Access denied; you need the SUPER privilege for this operation +ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation ---> connection: mysqltest_2_con use mysqltest; |