bk commit into 5.0 tree (malff:1.2390)

[marc.alff]

Below is the list of changes that have just been committed into a local
5.0 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 17:02:02-07:00, malff@weblab.(none) +3 -0
  Merge weblab.(none):/home/marcsql/TREE/mysql-4.1-24562
  into  weblab.(none):/home/marcsql/TREE/mysql-5.0-24562-merge
  MERGE: 1.1616.2873.45

  mysql-test/r/alter_table.result@stripped, 2007-01-18 17:01:52-07:00, malff@weblab.(none) +0
-113
    MERGE: 1.40.1.13

  mysql-test/t/alter_table.test@stripped, 2007-01-18 17:01:44-07:00, malff@weblab.(none) +0 -1
    Auto merged
    MERGE: 1.29.1.14

  sql/sql_yacc.yy@stripped, 2007-01-18 17:01:57-07:00, malff@weblab.(none) +0 -24
    MERGE: 1.203.1.200

# 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.0-24562-merge/RESYNC

--- 1.47/mysql-test/t/alter_table.test	2007-01-18 17:02:07 -07:00
+++ 1.48/mysql-test/t/alter_table.test	2007-01-18 17:02:07 -07:00
@@ -528,6 +528,71 @@ SHOW INDEX FROM bug24219_2;
 
 DROP TABLE bug24219_2;
 
+#
+# Bug#24562 (ALTER TABLE ... ORDER BY ... with complex expression asserts)
+#
+
+--disable_warnings
+drop table if exists table_24562;
+--enable_warnings
+
+create table table_24562(
+  section int,
+  subsection int,
+  title varchar(50));
+
+insert into table_24562 values
+(1, 0, "Introduction"),
+(1, 1, "Authors"),
+(1, 2, "Acknowledgements"),
+(2, 0, "Basics"),
+(2, 1, "Syntax"),
+(2, 2, "Client"),
+(2, 3, "Server"),
+(3, 0, "Intermediate"),
+(3, 1, "Complex queries"),
+(3, 2, "Stored Procedures"),
+(3, 3, "Stored Functions"),
+(4, 0, "Advanced"),
+(4, 1, "Replication"),
+(4, 2, "Load balancing"),
+(4, 3, "High availability"),
+(5, 0, "Conclusion");
+
+select * from table_24562;
+
+alter table table_24562 add column reviewer varchar(20),
+order by title;
+
+select * from table_24562;
+
+update table_24562 set reviewer="Me" where section=2;
+update table_24562 set reviewer="You" where section=3;
+
+alter table table_24562
+order by section ASC, subsection DESC;
+
+select * from table_24562;
+
+alter table table_24562
+order by table_24562.subsection ASC, table_24562.section DESC;
+
+select * from table_24562;
+
+--error 1064
+alter table table_24562 order by 12;
+--error 1064
+alter table table_24562 order by (section + 12);
+--error 1064
+alter table table_24562 order by length(title);
+--error 1064
+alter table table_24562 order by (select 12 from dual);
+
+--error 1054
+alter table table_24562 order by no_such_col;
+
+drop table table_24562;
+
 # End of 4.1 tests
 
 #