diff options
| -rw-r--r-- | mysql-test/r/ps.result | 14 | ||||
| -rw-r--r-- | mysql-test/r/ps_not_windows.result | 14 | ||||
| -rw-r--r-- | mysql-test/r/windows.result | 16 | ||||
| -rw-r--r-- | mysql-test/t/ps.test | 14 | ||||
| -rw-r--r-- | mysql-test/t/ps_not_windows.test | 23 | ||||
| -rw-r--r-- | mysql-test/t/windows.test | 23 |
6 files changed, 76 insertions, 28 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index 062d9428f43..5c97000b776 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -2090,14 +2090,6 @@ v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI deallocate prepare abc; drop view v1; drop table t1; -create procedure proc_1() install plugin my_plug soname '/root/some_plugin.so'; -call proc_1(); -ERROR HY000: No paths allowed for shared library -call proc_1(); -ERROR HY000: No paths allowed for shared library -call proc_1(); -ERROR HY000: No paths allowed for shared library -drop procedure proc_1; create procedure proc_1() install plugin my_plug soname 'some_plugin.so'; call proc_1(); ERROR HY000: Can't open shared library @@ -2112,12 +2104,6 @@ select func_1(), func_1(), func_1() from dual; ERROR 42000: FUNCTION test.func_1 does not exist drop function func_1; ERROR 42000: FUNCTION test.func_1 does not exist -prepare abc from "install plugin my_plug soname '/root/some_plugin.so'"; -execute abc; -ERROR HY000: No paths allowed for shared library -execute abc; -ERROR HY000: No paths allowed for shared library -deallocate prepare abc; prepare abc from "install plugin my_plug soname 'some_plugin.so'"; deallocate prepare abc; create procedure proc_1() uninstall plugin my_plug; diff --git a/mysql-test/r/ps_not_windows.result b/mysql-test/r/ps_not_windows.result new file mode 100644 index 00000000000..e58b6ec5cad --- /dev/null +++ b/mysql-test/r/ps_not_windows.result @@ -0,0 +1,14 @@ +create procedure proc_1() install plugin my_plug soname '/root/some_plugin.so'; +call proc_1(); +ERROR HY000: No paths allowed for shared library +call proc_1(); +ERROR HY000: No paths allowed for shared library +call proc_1(); +ERROR HY000: No paths allowed for shared library +drop procedure proc_1; +prepare abc from "install plugin my_plug soname '/root/some_plugin.so'"; +execute abc; +ERROR HY000: No paths allowed for shared library +execute abc; +ERROR HY000: No paths allowed for shared library +deallocate prepare abc; diff --git a/mysql-test/r/windows.result b/mysql-test/r/windows.result index 039c5b1476e..19f92415cc9 100644 --- a/mysql-test/r/windows.result +++ b/mysql-test/r/windows.result @@ -6,3 +6,19 @@ use prn; ERROR 42000: Unknown database 'prn' create table nu (a int); drop table nu; +create procedure proc_1() install plugin my_plug soname '\\root\\some_plugin.dll'; +call proc_1(); +ERROR HY000: No paths allowed for shared library +call proc_1(); +ERROR HY000: No paths allowed for shared library +call proc_1(); +ERROR HY000: No paths allowed for shared library +drop procedure proc_1; +create procedure proc_1() install plugin my_plug soname '\\root\\some_plugin.dll'; +call proc_1(); +ERROR HY000: No paths allowed for shared library +call proc_1(); +ERROR HY000: No paths allowed for shared library +call proc_1(); +ERROR HY000: No paths allowed for shared library +drop procedure proc_1; diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index ce8bc12db49..d04bcc40c0e 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -2092,14 +2092,6 @@ drop view v1; drop table t1; -create procedure proc_1() install plugin my_plug soname '/root/some_plugin.so'; ---error ER_UDF_NO_PATHS -call proc_1(); ---error ER_UDF_NO_PATHS -call proc_1(); ---error ER_UDF_NO_PATHS -call proc_1(); -drop procedure proc_1; create procedure proc_1() install plugin my_plug soname 'some_plugin.so'; --replace_regex /(Can\'t open shared library).*$/\1/ --error ER_CANT_OPEN_LIBRARY @@ -2119,12 +2111,6 @@ delimiter ;| select func_1(), func_1(), func_1() from dual; --error ER_SP_DOES_NOT_EXIST drop function func_1; -prepare abc from "install plugin my_plug soname '/root/some_plugin.so'"; ---error ER_UDF_NO_PATHS -execute abc; ---error ER_UDF_NO_PATHS -execute abc; -deallocate prepare abc; prepare abc from "install plugin my_plug soname 'some_plugin.so'"; deallocate prepare abc; diff --git a/mysql-test/t/ps_not_windows.test b/mysql-test/t/ps_not_windows.test new file mode 100644 index 00000000000..0d97df96285 --- /dev/null +++ b/mysql-test/t/ps_not_windows.test @@ -0,0 +1,23 @@ +# Non-windows specific ps tests. +--source include/not_windows.inc + +# +# Bug #20665: All commands supported in Stored Procedures should work in +# Prepared Statements +# + +create procedure proc_1() install plugin my_plug soname '/root/some_plugin.so'; +--error ER_UDF_NO_PATHS +call proc_1(); +--error ER_UDF_NO_PATHS +call proc_1(); +--error ER_UDF_NO_PATHS +call proc_1(); +drop procedure proc_1; + +prepare abc from "install plugin my_plug soname '/root/some_plugin.so'"; +--error ER_UDF_NO_PATHS +execute abc; +--error ER_UDF_NO_PATHS +execute abc; +deallocate prepare abc; diff --git a/mysql-test/t/windows.test b/mysql-test/t/windows.test index d6bcfeb8cb3..d668a3f4411 100644 --- a/mysql-test/t/windows.test +++ b/mysql-test/t/windows.test @@ -18,3 +18,26 @@ create table nu (a int); drop table nu; # End of 4.1 tests + +# +# Bug #20665: All commands supported in Stored Procedures should work in +# Prepared Statements +# + +create procedure proc_1() install plugin my_plug soname '\\root\\some_plugin.dll'; +--error ER_UDF_NO_PATHS +call proc_1(); +--error ER_UDF_NO_PATHS +call proc_1(); +--error ER_UDF_NO_PATHS +call proc_1(); +drop procedure proc_1; + +create procedure proc_1() install plugin my_plug soname '\\root\\some_plugin.dll'; +--error ER_UDF_NO_PATHS +call proc_1(); +--error ER_UDF_NO_PATHS +call proc_1(); +--error ER_UDF_NO_PATHS +call proc_1(); +drop procedure proc_1; |