Merge stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/type_set.result:
  Auto merged
mysql-test/t/type_set.test:
  Manual merge

mysql-test/t/type_set.test

@@ -75,4 +75,4 @@ INSERT INTO t1 VALUES(9223372036854775808);
 SELECT * FROM t1;
 DROP TABLE t1;
 
--- echo End of 5.0 tests
+--echo End of 5.0 tests