Commit 941beef6 authored by unknown's avatar unknown
Browse files

Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.1 

into  macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt


sql/table.cc:
  Auto merged
parents c0c31939 5cffd57e

mysql-test/r/ps.result

+0 −14
Original line number Diff line number Diff line
@@ -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;

mysql-test/r/ps_not_windows.result

0 → 100644
+14 −0
Original line number Diff line number Diff line 
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;

mysql-test/r/windows.result

+14 −0
Original line number Diff line number Diff line
@@ -6,3 +6,17 @@ 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;

prepare abc from "install plugin my_plug soname '\\\\root\\\\some_plugin.dll'";

execute abc;

ERROR HY000: No paths allowed for shared library

execute abc;

ERROR HY000: No paths allowed for shared library

deallocate prepare abc;

mysql-test/t/ps.test

+0 −14
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/ps_not_windows.test

0 → 100644
+23 −0
Original line number Diff line number Diff line 
# 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;