diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-12-12 23:58:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-12-12 23:58:40 +0100 |
| commit | 2ccf247e939b39d1f84908a56b8717150e5fd1b4 (patch) | |
| tree | c0a9a318a055f87e13206656d7765f96d3293d9f /mysql-test/r/alter_table.result | |
| parent | 6cc9d0ffa0b6d9d0f19cf9445fad0e0ba11e38f8 (diff) | |
| download | mariadb-git-2ccf247e939b39d1f84908a56b8717150e5fd1b4.tar.gz | |
after merge changes:
* rename all debugging related command-line options
and variables to start from "debug-", and made them all
OFF by default.
* replace "MySQL" with "MariaDB" in error messages
* "Cast ... converted ... integer to it's ... complement"
is now a note, not a warning
* @@query_cache_strip_comments now has a session scope,
not global.
Diffstat (limited to 'mysql-test/r/alter_table.result')
| -rw-r--r-- | mysql-test/r/alter_table.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result index b62da05b4a2..624cc7afa98 100644 --- a/mysql-test/r/alter_table.result +++ b/mysql-test/r/alter_table.result @@ -696,13 +696,13 @@ section subsection title reviewer 3 3 Stored Functions You 2 3 Server Me alter table table_24562 order by 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 '12' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '12' at line 1 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 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB 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 '(title)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB 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 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB 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; ERROR 42S22: Unknown column 'no_such_col' in 'order clause' drop table table_24562; |