Merge olga.mysql.com:/home/igor/mysql-5.0-opt

into  olga.mysql.com:/home/igor/mysql-5.1-opt


mysql-test/r/type_bit.result:
  Auto merged
mysql-test/t/type_bit.test:
  Auto merged

mysql-test/r/type_bit.result

@@ -618,14 +618,6 @@ bit_field	int_field
 
	2
 handler t1 close;
 drop table t1;
-CREATE TABLE t1 (b BIT(2));
-INSERT INTO t1 (b) VALUES (1), (3), (0), (3);
-SELECT b+0, COUNT(DISTINCT b) FROM t1 GROUP BY b;
-b+0	COUNT(DISTINCT b)
-0	1
-1	1
-3	1
-DROP TABLE t1;
 CREATE TABLE t1 (b BIT(2), a VARCHAR(5));
 INSERT INTO t1 (b, a) VALUES (1, "x"), (3, "zz"), (0, "y"), (3, "z");
 SELECT b+0, COUNT(DISTINCT a) FROM t1 GROUP BY b;

mysql-test/t/type_bit.test

@@ -276,11 +276,6 @@ drop table t1;
 # Bug #30219: GROUP BY a column of the BIT type
 #
 
-CREATE TABLE t1 (b BIT(2));
-INSERT INTO t1 (b) VALUES (1), (3), (0), (3);
-SELECT b+0, COUNT(DISTINCT b) FROM t1 GROUP BY b;
-DROP TABLE t1;
-
 CREATE TABLE t1 (b BIT(2), a VARCHAR(5));
 INSERT INTO t1 (b, a) VALUES (1, "x"), (3, "zz"), (0, "y"), (3, "z");
 SELECT b+0, COUNT(DISTINCT a) FROM t1 GROUP BY b;