diff options
| author | evgen@moonbone.local <> | 2006-06-20 23:49:33 +0400 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2006-06-20 23:49:33 +0400 |
| commit | 52d86dff85830a5fb467e70fc5335cc06c5ec42e (patch) | |
| tree | 7a4a1c029b51a17919d4fcee4f88c113de3a3233 /mysql-test/r | |
| parent | c311fb0500fac171e1bfab97f898127b7fb95d77 (diff) | |
| parent | ae6970e6bc4cf01a2c91ddaabf8ec31b4377e04c (diff) | |
| download | mariadb-git-52d86dff85830a5fb467e70fc5335cc06c5ec42e.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/insert_select.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/select.result | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result index 028b40ac3b6..1d7aef256e1 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 42S02: Unknown table 't2' 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; diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index 7808e787e39..c7df11ab018 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -2738,3 +2738,9 @@ ERROR HY000: Key 'a' doesn't exist in table 't1' EXPLAIN SELECT * FROM t1 FORCE INDEX (a); ERROR HY000: Key 'a' doesn't exist in table 't1' DROP TABLE t1; +CREATE TABLE t1 (i BIGINT UNSIGNED NOT NULL); +INSERT INTO t1 VALUES (10); +SELECT i='1e+01',i=1e+01, i in (1e+01), i in ('1e+01') FROM t1; +i='1e+01' i=1e+01 i in (1e+01) i in ('1e+01') +0 1 1 1 +DROP TABLE t1; |