summaryrefslogtreecommitdiff
path: root/mysql-test/main/ps.result
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-06-05 18:55:11 +0300
committerMonty <monty@mariadb.org>2020-06-14 19:39:42 +0300
commitdfb41fddf69ccbca89fd322901f2809bc3bcc0e9 (patch)
tree5b82e40e36fe4f250679aa87de41c2c2179c595c /mysql-test/main/ps.result
parent346d10a953790f41d9457e7d52fd7d5271e8f956 (diff)
downloadmariadb-git-dfb41fddf69ccbca89fd322901f2809bc3bcc0e9.tar.gz
Make error messages from DROP TABLE and DROP TABLE IF EXISTS consistent
- IF EXISTS ends with a list of all not existing object, instead of a separate note for every not existing object - Produce a "Note" for all wrongly dropped objects (like trying to do DROP SEQUENCE for a normal table) - Do not write existing tables that could not be dropped to binlog Other things: MDEV-22820 Bogus "Unknown table" warnings produced upon attempt to drop parent table referenced by FK This was caused by an older version of this commit patch and later fixed
Diffstat (limited to 'mysql-test/main/ps.result')
-rw-r--r--mysql-test/main/ps.result12
1 files changed, 4 insertions, 8 deletions
diff --git a/mysql-test/main/ps.result b/mysql-test/main/ps.result
index f1972b6b40e..d97720c2d41 100644
--- a/mysql-test/main/ps.result
+++ b/mysql-test/main/ps.result
@@ -2856,12 +2856,10 @@ Level Code Message
Note 1051 Unknown table 'test.t2'
drop table if exists t1, t2;
Warnings:
-Note 1051 Unknown table 'test.t1'
-Note 1051 Unknown table 'test.t2'
+Note 1051 Unknown table 'test.t1,test.t2'
call proc_1();
Level Code Message
-Note 1051 Unknown table 'test.t1'
-Note 1051 Unknown table 'test.t2'
+Note 1051 Unknown table 'test.t1,test.t2'
drop procedure proc_1;
create function func_1() returns int begin show warnings; return 1; end|
ERROR 0A000: Not allowed to return a result set from a function
@@ -2880,12 +2878,10 @@ Level Code Message
Note 1051 Unknown table 'test.t2'
drop table if exists t1, t2;
Warnings:
-Note 1051 Unknown table 'test.t1'
-Note 1051 Unknown table 'test.t2'
+Note 1051 Unknown table 'test.t1,test.t2'
execute abc;
Level Code Message
-Note 1051 Unknown table 'test.t1'
-Note 1051 Unknown table 'test.t2'
+Note 1051 Unknown table 'test.t1,test.t2'
deallocate prepare abc;
set @my_password="password";
set @my_data="clear text to encode";