merging

757e5d95 · unknown · e8bd2255 · 757e5d95
Commit 757e5d95 authored Nov 05, 2007 by unknown
Hide 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
@@ -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 '',