From c27988f9910cee9a9bbb8d186bdb1028a07307df Mon Sep 17 00:00:00 2001
From: "igor@olga.mysql.com" <>
Date: Sun, 17 Jun 2007 11:43:49 -0700
Subject: [PATCH] Post-merge fix

---
 mysql-test/r/func_str.result | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index d22b184b9ec..ce9633006af 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -2151,5 +2151,6 @@ INSERT INTO t1 VALUES ('bar', 2), ('foo', 0);
 SELECT SUBSTR(a,1,len) FROM t1;
 SUBSTR(a,1,len)
 ba
+
 DROP TABLE t1;
 End of 5.0 tests