summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-10-06 01:00:35 +0200
committerunknown <msvensson@neptunus.(none)>2006-10-06 01:00:35 +0200
commit5c8da505963e1cc1100814912d45dccd5e454ce0 (patch)
treee7f7202b93cf18506bd6c17b9a89056f7dba9b12 /mysql-test/include
parent5bdc88183a9048d71fdb824c3ee204a1fb55ee17 (diff)
parent78c5bc62c59b5b168fb0625a70cc465ead4e59ae (diff)
downloadmariadb-git-5c8da505963e1cc1100814912d45dccd5e454ce0.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools client/mysqltest.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged Makefile.am: Manual merge
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/ctype_like_escape.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/ctype_like_escape.inc b/mysql-test/include/ctype_like_escape.inc
index ac97fbaa1a0..d4abc33c178 100644
--- a/mysql-test/include/ctype_like_escape.inc
+++ b/mysql-test/include/ctype_like_escape.inc
@@ -11,8 +11,8 @@ insert into t1 values('ab_def');
insert into t1 values('abc_ef');
insert into t1 values('abcd_f');
insert into t1 values('abcde_');
--- should return ab_def
+# should return ab_def
select c1 as c1u from t1 where c1 like 'ab\_def';
--- should return ab_def
+# should return ab_def
select c1 as c2h from t1 where c1 like 'ab#_def' escape '#';
drop table t1;