diff options
author | malff/marcsql@weblab.(none) <> | 2007-01-18 18:37:52 -0700 |
---|---|---|
committer | malff/marcsql@weblab.(none) <> | 2007-01-18 18:37:52 -0700 |
commit | 4064c89d2400a910e24813ce633f5c9522d1a321 (patch) | |
tree | 8cf46e9a8f33e14dd50f571f5b6b62418808023e /mysql-test/t/alter_table.test | |
parent | cacaa52bd9e229abafd638d5358c2cb8b54dd737 (diff) | |
download | mariadb-git-4064c89d2400a910e24813ce633f5c9522d1a321.tar.gz |
Manual merge
Diffstat (limited to 'mysql-test/t/alter_table.test')
-rw-r--r-- | mysql-test/t/alter_table.test | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test index 68f984c65e1..01f55931ca4 100644 --- a/mysql-test/t/alter_table.test +++ b/mysql-test/t/alter_table.test @@ -579,16 +579,16 @@ order by table_24562.subsection ASC, table_24562.section DESC; select * from table_24562; ---error 1064 +--error ER_PARSE_ERROR alter table table_24562 order by 12; ---error 1064 +--error ER_PARSE_ERROR alter table table_24562 order by (section + 12); ---error 1064 +--error ER_PARSE_ERROR alter table table_24562 order by length(title); ---error 1064 +--error ER_PARSE_ERROR alter table table_24562 order by (select 12 from dual); ---error 1054 +--error ER_BAD_FIELD_ERROR alter table table_24562 order by no_such_col; drop table table_24562; |