From d3891e99ff03039a1cdc72ae946a9883e3a83377 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 Nov 2007 18:43:13 +0400 Subject: [PATCH] merging --- 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 237c5eced39..6f6edd5112b 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -723,7 +723,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `bin(130)` varchar(64) DEFAULT NULL, - `oct(130)` varchar(64) EFAULT NULL, + `oct(130)` varchar(64) DEFAULT NULL, `conv(130,16,10)` varchar(64) DEFAULT NULL, `hex(130)` varchar(6) NOT NULL DEFAULT '', `char(130)` varbinary(4) NOT NULL DEFAULT '',