bk commit into 4.1 tree (sergefp:1.2243) BUG#10070

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
4.1 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2243 05/05/10 00:40:41 sergefp@stripped +1 -0
  Fix for BUG#10070: Make the test not to produce warnings if InnoDB is not available

  mysql-test/t/range.test
    1.25 05/05/10 00:40:39 sergefp@stripped +2 -0
    Fix for BUG#10070: Make the test not to produce warnings if InnoDB is not available

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	pslp.mylan
# Root:	/home/psergey/mysql-4.1-bug10095

--- 1.24/mysql-test/t/range.test	2005-04-17 00:05:06 +02:00
+++ 1.25/mysql-test/t/range.test	2005-05-10 00:40:39 +02:00
@@ -448,6 +448,7 @@
 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 '',
@@ -456,6 +457,7 @@
   `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),