cleanup for Item_func_regex (Bug #4199)

mysql-test/r/func_regexp.result:
  test of cleaning regex in PS
mysql-test/t/func_regexp.test:
  test of cleaning regex in PS
sql/item_cmpfunc.cc:
  cleanup for Item_func_regex
sql/item_cmpfunc.h:
  cleanup for Item_func_regex

1 files changed, 17 insertions, 0 deletions

diff --git a/mysql-test/r/func_regexp.result b/mysql-test/r/func_regexp.result
index 7f977e2782b..8228d6982d3 100644
--- a/mysql-test/r/func_regexp.result
+++ b/mysql-test/r/func_regexp.result
@@ -81,3 +81,20 @@ _latin1'a' regexp _latin1'A' collate latin1_general_ci
 select _latin1'a' regexp _latin1'A' collate latin1_bin;
 _latin1'a' regexp _latin1'A' collate latin1_bin
 0
+create table t1 (a varchar(40));
+insert into t1 values ('C1'),('C2'),('R1'),('C3'),('R2'),('R3');
+prepare stmt1 from 'select a from t1 where a rlike ? order by a';
+set @a="^C.*";
+execute stmt1 using @a;
+a
+C1
+C2
+C3
+set @a="^R.*";
+execute stmt1 using @a;
+a
+R1
+R2
+R3
+deallocate prepare stmt1;
+drop table t1;