summaryrefslogtreecommitdiff
path: root/mysql-test/r/sp-destruct.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-08-26 00:34:43 +0200
committerSergei Golubchik <serg@mariadb.org>2017-08-26 00:34:43 +0200
commitbb8e99fdc367a470c6195a2ae4c33f273fe55a25 (patch)
tree3b3bcacec8faab66bf6756f20dff1e45462fdc1c /mysql-test/r/sp-destruct.result
parentadd44e684cb9f1b46d1d5facdf6255360fa7b656 (diff)
parentc02d61bc11ee06b6043e6db9a15d00b9f40bce1f (diff)
downloadmariadb-git-bb8e99fdc367a470c6195a2ae4c33f273fe55a25.tar.gz
Merge branch 'bb-10.2-ext' into 10.3
Diffstat (limited to 'mysql-test/r/sp-destruct.result')
-rw-r--r--mysql-test/r/sp-destruct.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/sp-destruct.result b/mysql-test/r/sp-destruct.result
index 0eddfa70dd1..5bb3b17d4b8 100644
--- a/mysql-test/r/sp-destruct.result
+++ b/mysql-test/r/sp-destruct.result
@@ -12,7 +12,7 @@ create function bug14233_f() returns int
return 42;
create table t1 (id int);
create trigger t1_ai after insert on t1 for each row call bug14233();
-alter table mysql.proc drop type;
+alter table mysql.proc drop security_type;
call bug14233();
ERROR HY000: Column count of mysql.proc is wrong. Expected 20, found 19. The table is probably corrupted
create view v1 as select bug14233_f();
@@ -142,7 +142,7 @@ drop database if exists mysqltest;
flush table mysql.proc;
create database mysqltest;
# Corrupt mysql.proc to make it unusable by current version of server.
-alter table mysql.proc drop column type;
+alter table mysql.proc drop column security_type;
# The below statement should not cause assertion failure.
drop database mysqltest;
Warnings: