bk commit into 5.1 tree (malff:1.2406)

[marc.alff]

Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-18 21:30:25-07:00, malff@weblab.(none) +1 -0
  Manual merge

  mysql-test/r/alter_table.result@stripped, 2007-01-18 21:30:21-07:00, malff@weblab.(none) +1 -1
    Manual merge

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	malff
# Host:	weblab.(none)
# Root:	/home/marcsql/TREE/mysql-5.1-24562-merge

--- 1.72/mysql-test/r/alter_table.result	2007-01-18 21:30:31 -07:00
+++ 1.73/mysql-test/r/alter_table.result	2007-01-18 21:30:31 -07:00
@@ -810,7 +810,7 @@ ERROR 42000: You have an error in your S
 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;