diff options
| author | Monty <monty@mariadb.org> | 2016-10-03 18:49:44 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-10-05 01:11:08 +0300 |
| commit | af7490f95d9a0e99dafb70ae3ee5cc7cf044572e (patch) | |
| tree | 6dfa0e90d7ee6563572b080f3c6c6f56ca4dd96f /mysql-test/r/ps.result | |
| parent | c1125c32183042a2f7be433d2c10e499f843d82c (diff) | |
| download | mariadb-git-af7490f95d9a0e99dafb70ae3ee5cc7cf044572e.tar.gz | |
Remove end . from error messages to get them consistent
Fixed a few failing tests
Diffstat (limited to 'mysql-test/r/ps.result')
| -rw-r--r-- | mysql-test/r/ps.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index aca74671561..7e7a20ca9e6 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -2566,7 +2566,7 @@ call proc_1(); Got one of the listed errors drop procedure proc_1; create function func_1() returns int begin install plugin my_plug soname '/tmp/plugin'; return 1; end| -ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger. +ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger select func_1(), func_1(), func_1() from dual; ERROR 42000: FUNCTION test.func_1 does not exist drop function func_1; @@ -2582,7 +2582,7 @@ call proc_1(); ERROR 42000: PLUGIN my_plug does not exist drop procedure proc_1; create function func_1() returns int begin uninstall plugin my_plug; return 1; end| -ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger. +ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger select func_1(), func_1(), func_1() from dual; ERROR 42000: FUNCTION test.func_1 does not exist drop function func_1; @@ -2607,7 +2607,7 @@ call proc_1(); drop database if exists mysqltest_xyz; drop procedure proc_1; create function func_1() returns int begin create database mysqltest_xyz; return 1; end| -ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger. +ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger select func_1(), func_1(), func_1() from dual; ERROR 42000: FUNCTION test.func_1 does not exist drop function func_1; @@ -2670,7 +2670,7 @@ call proc_1(); drop user pstest_xyz@localhost; drop procedure proc_1; create function func_1() returns int begin create user pstest_xyz@localhost; return 1; end| -ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger. +ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger select func_1(), func_1(), func_1() from dual; ERROR 42000: FUNCTION test.func_1 does not exist drop function func_1; @@ -2709,7 +2709,7 @@ call proc_1(); drop event xyz; drop procedure proc_1; create function func_1() returns int begin alter event xyz comment 'xyz'; return 1; end| -ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger. +ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger prepare abc from "alter event xyz comment 'xyz'"; ERROR HY000: This command is not supported in the prepared statement protocol yet deallocate prepare abc; @@ -2724,7 +2724,7 @@ call proc_1(); ERROR HY000: Unknown event 'xyz' drop procedure proc_1; create function func_1() returns int begin drop event xyz; return 1; end| -ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger. +ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger prepare abc from "drop event xyz"; ERROR HY000: This command is not supported in the prepared statement protocol yet deallocate prepare abc; |