diff options
| author | unknown <cmiller@calliope.local.cmiller/calliope.local> | 2007-02-14 11:27:37 -0500 |
|---|---|---|
| committer | unknown <cmiller@calliope.local.cmiller/calliope.local> | 2007-02-14 11:27:37 -0500 |
| commit | 48be0a2ff17af54aab36b0b554175ae5756e3690 (patch) | |
| tree | 7c9fd27030b35104266e24d59e4c21c5a445468b /mysql-test/r/order_by.result | |
| parent | 9d66be72b0ee079cecc39e09d4f4c0f7e1849dbc (diff) | |
| parent | 4c4f50623896f43873420d6c8d8e2a320653d57a (diff) | |
| download | mariadb-git-48be0a2ff17af54aab36b0b554175ae5756e3690.tar.gz | |
Merge calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint--bug25126
into calliope.local.cmiller:/Volumes/Source/src/mysql-5.0-maint
sql/item.cc:
Auto merged
mysql-test/r/order_by.result:
Manual merge.
mysql-test/t/order_by.test:
Manual merge.
Diffstat (limited to 'mysql-test/r/order_by.result')
| -rw-r--r-- | mysql-test/r/order_by.result | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result index e81d46c9199..0185394cdad 100644 --- a/mysql-test/r/order_by.result +++ b/mysql-test/r/order_by.result @@ -874,6 +874,30 @@ num (select num + 2 FROM t1 LIMIT 1) SELECT a.a + 1 AS num FROM t1 a JOIN t1 b ON num = b.a; ERROR 42S22: Unknown column 'num' in 'on clause' DROP TABLE t1; +CREATE TABLE bug25126 ( +val int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY +); +UPDATE bug25126 SET MissingCol = MissingCol; +ERROR 42S22: Unknown column 'MissingCol' in 'field list' +UPDATE bug25126 SET val = val ORDER BY MissingCol; +ERROR 42S22: Unknown column 'MissingCol' in 'order clause' +UPDATE bug25126 SET val = val ORDER BY val; +UPDATE bug25126 SET val = 1 ORDER BY val; +UPDATE bug25126 SET val = 1 ORDER BY MissingCol; +ERROR 42S22: Unknown column 'MissingCol' in 'order clause' +UPDATE bug25126 SET val = 1 ORDER BY val, MissingCol; +ERROR 42S22: Unknown column 'MissingCol' in 'order clause' +UPDATE bug25126 SET val = MissingCol ORDER BY MissingCol; +ERROR 42S22: Unknown column 'MissingCol' in 'order clause' +UPDATE bug25126 SET MissingCol = 1 ORDER BY val, MissingCol; +ERROR 42S22: Unknown column 'MissingCol' in 'order clause' +UPDATE bug25126 SET MissingCol = 1 ORDER BY MissingCol; +ERROR 42S22: Unknown column 'MissingCol' in 'order clause' +UPDATE bug25126 SET MissingCol = val ORDER BY MissingCol; +ERROR 42S22: Unknown column 'MissingCol' in 'order clause' +UPDATE bug25126 SET MissingCol = MissingCol ORDER BY MissingCol; +ERROR 42S22: Unknown column 'MissingCol' in 'order clause' +DROP TABLE bug25126; CREATE TABLE t1 (a int); SELECT p.a AS val, q.a AS val1 FROM t1 p, t1 q ORDER BY val > 1; val val1 |