Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql

sql/slave.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

2 files changed, 28 insertions, 0 deletions

diff --git a/mysql-test/r/func_regexp.result b/mysql-test/r/func_regexp.result
index 05b324d0c9e..5927dba0974 100644
--- a/mysql-test/r/func_regexp.result
+++ b/mysql-test/r/func_regexp.result
@@ -13,3 +13,13 @@ NULL
 NULL
 NULL
 NULL
+xxx
+this is a test of some long text to see what happens
+xxx
+this is a test of some long text to see what happens
+xxx
+this is a test of some long text to see what happens
+xxx
+this is a test of some long text to see what happens
+xxx
+this is some text: to test - out.reg exp (22/45)
diff --git a/mysql-test/t/func_regexp.test b/mysql-test/t/func_regexp.test
index 12341f1a661..7fbe4000cfc 100644
--- a/mysql-test/t/func_regexp.test
+++ b/mysql-test/t/func_regexp.test
@@ -2,6 +2,7 @@
 # Some regexp tests
 #
 
+drop table if exists t1;
 create table t1 (s1 char(64),s2 char(64));
 
 insert into t1 values('aaa','aaa');
@@ -24,3 +25,20 @@ insert into t1 values('ghi','ghi[');
 select HIGH_PRIORITY s1 regexp s2 from t1;
 
 drop table t1;
+
+#
+# This test a bug in regexp on Alpha
+#
+
+create table t1 (xxx char(128));
+insert into t1 (xxx) values('this is a test of some long text to see what happens');
+select * from t1 where xxx regexp('is a test of some long text to');
+select * from t1 where xxx regexp('is a test of some long text to ');
+select * from t1 where xxx regexp('is a test of some long text to s');
+select * from t1 where xxx regexp('is a test of some long text to se');
+drop table t1;
+
+create table t1 (xxx char(128));
+insert into t1 (xxx) values('this is some text: to test - out.reg exp (22/45)');
+select * from t1 where xxx REGEXP '^this is some text: to test - out\\.reg exp [[(][0-9]+[/\\][0-9]+[])][ ]*$';
+drop table t1;