merge

mysql-test/r/mysql.result

@@ -229,5 +229,4 @@ a:  b
   </row>
 </resultset>
 drop table t1;
-
-End of tests
+End of 5.0 tests

mysql-test/t/mysql.test

@@ -390,8 +390,11 @@ SELECT '< & >' AS `<`;
 EOF
 --exec $MYSQL --html test < $MYSQLTEST_VARDIR/tmp/bug27884.sql
 
+remove_file $MYSQLTEST_VARDIR/tmp/bug27884.sql;
+
+
 #
-# Bug #27884: mysql client + null byte
+# Bug #28203: mysql client + null byte
 # 
 create table t1 (a char(5));
 insert into t1 values ('\0b\0');
@@ -404,5 +407,5 @@ insert into t1 values ('\0b\0');
 --exec $MYSQL --xml test -e "select a from t1"
 drop table t1;
 
---echo
---echo End of tests
+
+--echo End of 5.0 tests