From 898740b6551e06c0670d018ba19de13d5134e34f Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 18 Jan 2007 21:30:25 -0700 Subject: [PATCH] Manual merge --- mysql-test/r/alter_table.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result index 16a20df0ad5..571ac8498b3 100644 --- a/mysql-test/r/alter_table.result +++ b/mysql-test/r/alter_table.result @@ -810,7 +810,7 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp alter table table_24562 order by (section + 12); ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(section + 12)' at line 1 alter table table_24562 order by length(title); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'length(title)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(title)' at line 1 alter table table_24562 order by (select 12 from dual); ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(select 12 from dual)' at line 1 alter table table_24562 order by no_such_col;