From 26ed736a92ed8e44165f05fa42b497a45986d6b6 Mon Sep 17 00:00:00 2001
From: "istruewing@stella.local" <>
Date: Fri, 14 Mar 2008 20:51:32 +0100
Subject: [PATCH] Post-merge fix

---
 mysql-test/r/type_set.result | 1 +
 mysql-test/t/type_set.test   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/type_set.result b/mysql-test/r/type_set.result
index 9829d4951c9..4722db1432f 100644
--- a/mysql-test/r/type_set.result
+++ b/mysql-test/r/type_set.result
@@ -93,3 +93,4 @@ c
 1,2,3
 64
 DROP TABLE t1;
+End of 5.0 tests
diff --git a/mysql-test/t/type_set.test b/mysql-test/t/type_set.test
index c7f8c59de28..e98555e137b 100644
--- a/mysql-test/t/type_set.test
+++ b/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