diff options
| author | unknown <gkodinov@mysql.com> | 2006-06-19 13:31:11 +0300 |
|---|---|---|
| committer | unknown <gkodinov@mysql.com> | 2006-06-19 13:31:11 +0300 |
| commit | a9ac0557db6b1e273f645c53701f3ab792ad2493 (patch) | |
| tree | 6746f5305d6dfd2efa8c2343991af44ee051ef3a /mysql-test/r/insert_select.result | |
| parent | 5d9b5f5e4c8d57b58f930f48dfd4553775bc7025 (diff) | |
| parent | 6cf425b856d651cc142cbee86eca11abf4d18a10 (diff) | |
| download | mariadb-git-a9ac0557db6b1e273f645c53701f3ab792ad2493.tar.gz | |
Merge mysql.com:/home/kgeorge/mysql/4.1/B9676
into mysql.com:/home/kgeorge/mysql/5.0/B9676
mysql-test/r/insert_select.result:
Auto merged
mysql-test/t/insert_select.test:
Auto merged
sql/sql_select.cc:
SCCS merged
Diffstat (limited to 'mysql-test/r/insert_select.result')
| -rw-r--r-- | mysql-test/r/insert_select.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result index 434dddb3049..2cfbb51441d 100644 --- a/mysql-test/r/insert_select.result +++ b/mysql-test/r/insert_select.result @@ -686,3 +686,7 @@ ERROR 42S22: Unknown column 'z' in 'field list' insert into t1(x,y) select x,z from t2 on duplicate key update x=values(t2.x); ERROR 42S22: Unknown column 't2.x' in 'field list' drop table t1,t2; +CREATE TABLE t1 (a int PRIMARY KEY); +INSERT INTO t1 values (1), (2); +INSERT INTO t1 SELECT a + 2 FROM t1 LIMIT 1; +DROP TABLE t1; |