bk commit into 4.1 tree (joerg:1.2452) BUG#16730

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
4.1 repository of joerg. When joerg 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.2452 06/01/24 13:54:34 joerg@stripped +1 -0
  Test "ctype_ucs":  Disable warnings if "InnoDB" is not configured ("classic" build) (bug#16730).

  mysql-test/t/ctype_ucs.test
    1.28 06/01/24 13:54:30 joerg@stripped +2 -0
    Disable warnings if "InnoDB" is not configured ("classic" build) (bug#16730).

# 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:	joerg
# Host:	trift2.
# Root:	/M41/bug16730-4.1

--- 1.27/mysql-test/t/ctype_ucs.test	2006-01-16 23:02:57 +01:00
+++ 1.28/mysql-test/t/ctype_ucs.test	2006-01-24 13:54:30 +01:00
@@ -422,7 +422,9 @@
 #
 # Bug #14583 Bug on query using a LIKE on indexed field with ucs2_bin collation
 #
+--disable_warnings
 create table t1(f1 varchar(5) CHARACTER SET ucs2 COLLATE ucs2_bin NOT NULL) engine=InnoDB;
+--enable_warnings
 insert into t1 values('a');
 create index t1f1 on t1(f1);
 select f1 from t1 where f1 like 'a%';