bk commit into 5.0 tree (igor:1.2170)

[igor]

Below is the list of changes that have just been committed into a local
5.0 repository of igor. When igor 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.2170 06/06/15 20:29:05 igor@stripped +1 -0
  Post_merges fixes.

  mysql-test/r/func_group.result
    1.51 06/06/15 20:28:59 igor@stripped +0 -2
    Post_merges fixes.

# 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:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/mysql-5.0-opt

--- 1.50/mysql-test/r/func_group.result	2006-06-15 18:40:13 -07:00
+++ 1.51/mysql-test/r/func_group.result	2006-06-15 20:28:59 -07:00
@@ -846,8 +846,6 @@
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	
 DROP TABLE t1;
 CREATE TABLE t1 (id int , b varchar(512), INDEX(b(250))) COLLATE latin1_bin;
-Warnings:
-Warning	1246	Converting column 'b' from CHAR to TEXT
 INSERT INTO t1 VALUES
 (1,CONCAT(REPEAT('_', 250), "qq")), (1,CONCAT(REPEAT('_', 250), "zz")),
 (1,CONCAT(REPEAT('_', 250), "aa")), (1,CONCAT(REPEAT('_', 250), "ff"));