bk commit into 4.1 tree (lenz:1.2261) BUG#10070

[lenz]

Below is the list of changes that have just been committed into a local
4.1 repository of lenz. When lenz 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.2261 05/05/10 14:44:03 lenz@stripped +2 -0
  Applied two patches already commited to the main tree to resolve bugs found during the build:
   - removed an "#error PRAGMA" from sql/item_strfunc.h (msvensson)
   - Fixed BUG#10070 (range test failed if InnoDB is not available) (sergefp)

  sql/item_strfunc.h
    1.94 05/05/10 14:43:57 lenz@stripped +0 -1
    Remove the testcode

  mysql-test/t/range.test
    1.26 05/05/10 14:43:56 lenz@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:	lenz
# Host:	metis.lenznet
# Root:	/space/my/mysql-4.1-build-clone

--- 1.93/sql/item_strfunc.h	2005-05-04 15:05:53 +02:00
+++ 1.94/sql/item_strfunc.h	2005-05-10 14:43:57 +02:00
@@ -18,7 +18,6 @@
 /* This file defines all string functions */
 
 #ifdef USE_PRAGMA_INTERFACE
-#error PRAGMA
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.25/mysql-test/t/range.test	2005-05-09 00:47:38 +02:00
+++ 1.26/mysql-test/t/range.test	2005-05-10 14:43:56 +02:00
@@ -450,6 +450,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 '',
@@ -458,6 +459,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),