From 3b7eb23e6b76c67678ad1f0744c37f3db0ec6600 Mon Sep 17 00:00:00 2001
From: "bar@deer.(none)" <>
Date: Mon, 17 Jan 2005 13:23:56 +0400
Subject: [PATCH] func_str.result:   after merge fix

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

diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index 2399099b478..1f78e5098f8 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -466,7 +466,7 @@ collation(hex(130))	coercibility(hex(130))
 latin1_swedish_ci	3
 select collation(char(130)), coercibility(hex(130));
 collation(char(130))	coercibility(hex(130))
-binary	3
+latin1_swedish_ci	3
 select collation(format(130,10)), coercibility(format(130,10));
 collation(format(130,10))	coercibility(format(130,10))
 latin1_swedish_ci	3