summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2005-05-10 10:49:50 +0200
committermsvensson@neptunus.(none) <>2005-05-10 10:49:50 +0200
commitf3890e94405c6700add76ab494be5f08914d18ff (patch)
tree2077399c26c84955527f934226af49301d7a30a9 /mysql-test
parent32024bfc4344d302d6b1ed22563c4dea637352a6 (diff)
parent689cb24b5b6c3f3959809d127b88ed249bbdc19e (diff)
downloadmariadb-git-f3890e94405c6700add76ab494be5f08914d18ff.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/t/range.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/range.test b/mysql-test/t/range.test
index e86688c4315..5d5f845e2bc 100644
--- a/mysql-test/t/range.test
+++ b/mysql-test/t/range.test
@@ -437,6 +437,7 @@ explain select * from t1 where a='aaa' collate latin1_german1_ci;
drop table t1;
# Test for BUG#9348 "result for WHERE A AND (B OR C) differs from WHERE a AND (C OR B)"
+--disable_warnings
CREATE TABLE t1 (
`CLIENT` char(3) character set latin1 collate latin1_bin NOT NULL default '000',
`ARG1` char(3) character set latin1 collate latin1_bin NOT NULL default '',
@@ -445,6 +446,7 @@ CREATE TABLE t1 (
`FUNCTINT` int(11) NOT NULL default '0',
KEY `VERI_CLNT~2` (`ARG1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+--enable_warnings
INSERT INTO t1 VALUES ('000',' 0',' 0','Text 001',0), ('000',' 0',' 1','Text 002',0),
('000',' 1',' 2','Text 003',0), ('000',' 2',' 3','Text 004',0),