diff options
| author | unknown <serg@janus.mylan> | 2007-02-26 16:12:40 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-02-26 16:12:40 +0100 |
| commit | 39622e126775b6b7de3b727aa4dd0da5fdab5d74 (patch) | |
| tree | abec5b528446805866d0c3e28ebea8ef58ccab4f /mysql-test/t/ps.test | |
| parent | 506af377b3af4b677fce194e0935aca4cd230a5a (diff) | |
| parent | 1eb71c68cb1b2f335a8e6b393cdb3e724ea65a0a (diff) | |
| download | mariadb-git-39622e126775b6b7de3b727aa4dd0da5fdab5d74.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
include/my_global.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
sql/tztime.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
support-files/Makefile.am:
Auto merged
BUILD/compile-solaris-sparc-forte:
merged
BUILD/compile-solaris-sparc-purify:
merged
Diffstat (limited to 'mysql-test/t/ps.test')
| -rw-r--r-- | mysql-test/t/ps.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index 805abe99426..14ee30f6026 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -2175,13 +2175,13 @@ drop table t1; 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 +--error ER_CANT_OPEN_LIBRARY,ER_FEATURE_DISABLED call proc_1(); --replace_regex /(Can\'t open shared library).*$/\1/ ---error ER_CANT_OPEN_LIBRARY +--error ER_CANT_OPEN_LIBRARY,ER_FEATURE_DISABLED call proc_1(); --replace_regex /(Can\'t open shared library).*$/\1/ ---error ER_CANT_OPEN_LIBRARY +--error ER_CANT_OPEN_LIBRARY,ER_FEATURE_DISABLED call proc_1(); drop procedure proc_1; delimiter |; |