bk commit into 5.1 tree (ted:1.2358) BUG#21524

[Vladimir Shebordaev]

Below is the list of changes that have just been committed into a local
5.1 repository of ted. When ted 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-10-11 07:08:32+04:00, ted@stripped +2 -0
  BUG#21524 ER_CANT_OPEN_LIBRARY output message used to confuse mysqltest on Solaris. Varying part of the message is now suppressed 

  mysql-test/r/ps.result@stripped, 2006-10-11 07:08:29+04:00, ted@stripped +3 -3
    ps.result updated

  mysql-test/t/ps.test@stripped, 2006-10-11 07:08:29+04:00, ted@stripped +3 -3
    The error code and the additional output grepped out of ER_CANT_OPEN_LIBRARY message due to the output varies across different platforms

# 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:	ted
# Host:	ted.mysql.internal
# Root:	/home/ted/src/mysql/mysql-5.1-new-maint

--- 1.79/mysql-test/r/ps.result	2006-10-11 07:08:39 +04:00
+++ 1.80/mysql-test/r/ps.result	2006-10-11 07:08:39 +04:00
@@ -1969,11 +1969,11 @@
 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 PATH_TO_SO (errno: 0 cannot open shared object file: No such file or directory)
+ERROR HY000: Can't open shared library
 call proc_1();
-ERROR HY000: Can't open shared library PATH_TO_SO (errno: 22 cannot open shared object file: No such file or directory)
+ERROR HY000: Can't open shared library
 call proc_1();
-ERROR HY000: Can't open shared library PATH_TO_SO (errno: 22 cannot open shared object file: No such file or directory)
+ERROR HY000: Can't open shared library
 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.

--- 1.78/mysql-test/t/ps.test	2006-10-11 07:08:39 +04:00
+++ 1.79/mysql-test/t/ps.test	2006-10-11 07:08:40 +04:00
@@ -1991,13 +1991,13 @@
 call proc_1();
 drop procedure proc_1;
 create procedure proc_1() install plugin my_plug soname 'some_plugin.so';
---replace_regex / \'.*\'/ PATH_TO_SO/
+--replace_regex /(Can\'t open shared library).*$/\1/
 --error ER_CANT_OPEN_LIBRARY
 call proc_1();
---replace_regex / \'.*\'/ PATH_TO_SO/
+--replace_regex /(Can\'t open shared library).*$/\1/
 --error ER_CANT_OPEN_LIBRARY
 call proc_1();
---replace_regex / \'.*\'/ PATH_TO_SO/
+--replace_regex /(Can\'t open shared library).*$/\1/
 --error ER_CANT_OPEN_LIBRARY
 call proc_1();
 drop procedure proc_1;