From cb8ffea15e0a6bdd8cf78eb63112cc6a6ab4448b Mon Sep 17 00:00:00 2001
From: unknown <Sinisa@sinisa.nasamreza.org>
Date: Sat, 25 Dec 2004 00:07:22 +0200
Subject: [PATCH] additional 4.0 -> 4.1 merge !!

mysql-test/r/func_str.result:
  a little, very little mistake in the merge process
---
 mysql-test/r/func_str.result | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index f4185ad93de..1c560dfa8b4 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -691,7 +691,6 @@ select count(*) as total, left(c,10) as reg from t1 group by reg order by reg de
 total	reg
 10	2004-12-10
 drop table t1;
-
 select quote(ltrim(concat('    ', 'a')));
 quote(ltrim(concat('    ', 'a')))
 'a'