diff options
| author | unknown <evgen@moonbone.local> | 2006-06-28 19:34:04 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-06-28 19:34:04 +0400 |
| commit | a68075513a87c9b75e4b7165221a79d9e08c056d (patch) | |
| tree | 3c5baf35e4a619852c09b91014b8172b38a30001 /mysql-test/r/insert_select.result | |
| parent | e2bf3f0318b9b641127ff63c2f8e2b282554cf39 (diff) | |
| parent | 907acc785da95878f0ff7eb6a5b88b5b18e713a8 (diff) | |
| download | mariadb-git-a68075513a87c9b75e4b7165221a79d9e08c056d.tar.gz | |
Manual merge
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/insert_select.result:
Auto merged
mysql-test/r/key.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/key.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
sql/field.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/insert_select.result')
| -rw-r--r-- | mysql-test/r/insert_select.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result index bcad0460acc..390e76caf2c 100644 --- a/mysql-test/r/insert_select.result +++ b/mysql-test/r/insert_select.result @@ -690,3 +690,8 @@ 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; +CREATE TABLE t1 (x int, y int); +CREATE TABLE t2 (z int, y int); +CREATE TABLE t3 (a int, b int); +INSERT INTO t3 (SELECT x, y FROM t1 JOIN t2 USING (y) WHERE z = 1); +DROP TABLE IF EXISTS t1,t2,t3; |