bk commit into 4.1 tree (ramil:1.2503)

[ramil]

Below is the list of changes that have just been committed into a local
4.1 repository of ram. When ram 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.2503 06/04/11 15:26:18 ramil@stripped +1 -0
  after merge fix.

  mysql-test/t/func_op.test
    1.8 06/04/11 15:25:24 ramil@stripped +2 -0
    after merge fix.

# 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:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/mysql-4.1

--- 1.7/mysql-test/t/func_op.test	2006-04-11 13:53:30 +05:00
+++ 1.8/mysql-test/t/func_op.test	2006-04-11 15:25:24 +05:00
@@ -21,7 +21,9 @@ select -1 >> 1, -1 << 1;
 # Bug 13044: wrong bit_count() results
 #
 
+--disable_warnings
 drop table if exists t1,t2;
+--enable_warnings
 create table t1(a int);
 create table t2(a int, b int);
 insert into t1 values (1), (2), (3);