diff options
author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-03-08 21:14:31 +0400 |
---|---|---|
committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-03-08 21:14:31 +0400 |
commit | 0fcd9c2bfb68e8c2078e975d69cb25992324fe13 (patch) | |
tree | 7c49046b65481c7d5faa15b714e63bd431a7c166 /mysql-test | |
parent | 5130e88e418f48c9e15e8ecb730b68dd9174cec1 (diff) | |
parent | 72773f4f8adfe8b4973d0392914d15ada43021e6 (diff) | |
download | mariadb-git-0fcd9c2bfb68e8c2078e975d69cb25992324fe13.tar.gz |
Merge bk@192.168.21.1:mysql-4.1
into mysql.com:/home/hf/work/mrg/mysql-4.1-opt
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/update.result | 4 | ||||
-rw-r--r-- | mysql-test/t/update.test | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/update.result b/mysql-test/r/update.result index 0f86a959250..186e0955e61 100644 --- a/mysql-test/r/update.result +++ b/mysql-test/r/update.result @@ -377,3 +377,7 @@ create table t1(f1 int, `*f2` int); insert into t1 values (1,1); update t1 set `*f2`=1; drop table t1; +create table t1(f1 int); +update t1 set f2=1 order by f2; +ERROR 42S22: Unknown column 'f2' in 'order clause' +drop table t1; diff --git a/mysql-test/t/update.test b/mysql-test/t/update.test index c69c56f0331..e5287eacbc8 100644 --- a/mysql-test/t/update.test +++ b/mysql-test/t/update.test @@ -306,4 +306,12 @@ create table t1(f1 int, `*f2` int); insert into t1 values (1,1); update t1 set `*f2`=1; drop table t1; + +# +# Bug#25126: Wrongly resolved field leads to a crash +# +create table t1(f1 int); +--error 1054 +update t1 set f2=1 order by f2; +drop table t1; # End of 4.1 tests |