diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2014-06-25 21:00:24 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@skysql.com> | 2014-06-25 21:00:24 +0300 |
| commit | aa224716339ce499731625e9451eda3cfb206283 (patch) | |
| tree | 12aa833ff9443b95a18ee6c8c3740a09c8bcb60d /mysql-test/r/sp-destruct.result | |
| parent | 5893ae0b81461da9edcc6d7d0f3bbc55787be446 (diff) | |
| parent | 787ec317784d58ca00c0c8e772173c66c5145f50 (diff) | |
| download | mariadb-git-aa224716339ce499731625e9451eda3cfb206283.tar.gz | |
Merge branch '10.1' of github.com:MariaDB/server into 10.1
Conflicts:
storage/xtradb/handler/ha_innodb.cc
Diffstat (limited to 'mysql-test/r/sp-destruct.result')
| -rw-r--r-- | mysql-test/r/sp-destruct.result | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/r/sp-destruct.result b/mysql-test/r/sp-destruct.result index 172e40cb40c..fe68229aaec 100644 --- a/mysql-test/r/sp-destruct.result +++ b/mysql-test/r/sp-destruct.result @@ -128,11 +128,8 @@ CREATE FUNCTION f1() RETURNS INT RETURN 1; RENAME TABLE mysql.procs_priv TO procs_priv_backup; FLUSH TABLE mysql.procs_priv; DROP FUNCTION f1; -ERROR 42S02: Table 'mysql.procs_priv' doesn't exist SHOW WARNINGS; Level Code Message -Error 1146 Table 'mysql.procs_priv' doesn't exist -Warning 1405 Failed to revoke all privileges to dropped routine # Restore the procs_priv table RENAME TABLE procs_priv_backup TO mysql.procs_priv; FLUSH TABLE mysql.procs_priv; |