func_str.result:

after merge fix

func_str.result:
after merge fix
3b7eb23e · bar@deer.(none) · 3d471442 · 3b7eb23e
Commit 3b7eb23e authored Jan 17, 2005 by bar@deer.(none)
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/r/func_str.result mysql-test/r/func_str.result +1 -1

No files found.
--- 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