bk commit into 5.1 tree (iggy:1.2373) BUG#23983

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.1 repository of Administrator. When Administrator does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-16 17:42:31-05:00, iggy@amd64. +2 -0
  Bug#23983 ps.test fails to open shared library
  - ps.test was failing because it was expecting the incorrect error for a
  non-existant shared library in a non-existant path.  Correct the test and
  result for /root/some_plugin.so to match the result for /some_plugin.so.

  mysql-test/r/ps.result@stripped, 2006-11-16 17:42:28-05:00, iggy@amd64. +6 -6
    Bug#23983 ps.test fails to open shared library
    - Correct results

  mysql-test/t/ps.test@stripped, 2006-11-16 17:42:28-05:00, iggy@amd64. +11 -6
    Bug#23983 ps.test fails to open shared library
    - Correct tests.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	iggy
# Host:	amd64.
# Root:	D:/src/mysql-5.1-maint_23983

--- 1.87/mysql-test/r/ps.result	2006-11-16 17:42:42 -05:00
+++ 1.88/mysql-test/r/ps.result	2006-11-16 17:42:42 -05:00
@@ -2092,11 +2092,11 @@
 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
+ERROR HY000: Can't open shared library
 call proc_1();
-ERROR HY000: No paths allowed for shared library
+ERROR HY000: Can't open shared library
 call proc_1();
-ERROR HY000: No paths allowed for shared library
+ERROR HY000: Can't open shared library
 drop procedure proc_1;
 create procedure proc_1() install plugin my_plug soname 'some_plugin.so';
 call proc_1();
@@ -2114,11 +2114,11 @@
 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
+ERROR HY000: Can't open shared library
 deallocate prepare abc;
 prepare abc from "install plugin my_plug soname 'some_plugin.so'";
+execute abc;
+ERROR HY000: Can't open shared library
 deallocate prepare abc;
 create procedure proc_1() uninstall plugin my_plug;
 call proc_1();

--- 1.86/mysql-test/t/ps.test	2006-11-16 17:42:42 -05:00
+++ 1.87/mysql-test/t/ps.test	2006-11-16 17:42:42 -05:00
@@ -2093,11 +2093,14 @@
 
 
 create procedure proc_1() install plugin my_plug soname '/root/some_plugin.so';
---error ER_UDF_NO_PATHS
+--replace_regex /(Can\'t open shared library).*$/\1/
+--error ER_CANT_OPEN_LIBRARY
 call proc_1();
---error ER_UDF_NO_PATHS
+--replace_regex /(Can\'t open shared library).*$/\1/
+--error ER_CANT_OPEN_LIBRARY
 call proc_1();
---error ER_UDF_NO_PATHS
+--replace_regex /(Can\'t open shared library).*$/\1/
+--error ER_CANT_OPEN_LIBRARY
 call proc_1();
 drop procedure proc_1;
 create procedure proc_1() install plugin my_plug soname 'some_plugin.so';
@@ -2120,12 +2123,14 @@
 --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
+--replace_regex /(Can\'t open shared library).*$/\1/
+--error ER_CANT_OPEN_LIBRARY
 execute abc;
 deallocate prepare abc;
 prepare abc from "install plugin my_plug soname 'some_plugin.so'";
+--replace_regex /(Can\'t open shared library).*$/\1/
+--error ER_CANT_OPEN_LIBRARY
+execute abc;
 deallocate prepare abc;