diff options
author | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-07-10 16:44:05 +0300 |
---|---|---|
committer | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-07-10 16:44:05 +0300 |
commit | a8a6361b496ecb15c4d5181c0fed40548016540a (patch) | |
tree | 664c30fcd3726f59f3518eecd44f0a1f90eecc9d /mysql-test/r/odbc.result | |
parent | a8fd83d676a5d8a64921f1f13ba4fa4f45221da8 (diff) | |
parent | ca1e4aabfa9593dffe1ab6148e60fb303bad76de (diff) | |
download | mariadb-git-a8a6361b496ecb15c4d5181c0fed40548016540a.tar.gz |
Merge macbook.gmz:/Users/kgeorge/mysql/work/B14553-4.1-opt
into macbook.gmz:/Users/kgeorge/mysql/work/B14553-5.0-opt
mysql-test/r/odbc.result:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/rpl_insert_id.result:
merge the test at the end of 4.1 test
mysql-test/t/rpl_insert_id.test:
merge the test at the end of 4.1 test
sql/sql_class.cc:
merged
sql/sql_class.h:
merged
Diffstat (limited to 'mysql-test/r/odbc.result')
-rw-r--r-- | mysql-test/r/odbc.result | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/odbc.result b/mysql-test/r/odbc.result index 2d9d39393b1..5629d3dab33 100644 --- a/mysql-test/r/odbc.result +++ b/mysql-test/r/odbc.result @@ -14,3 +14,14 @@ explain select * from t1 where b is null; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE drop table t1; +CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY); +INSERT INTO t1 VALUES (NULL); +SELECT sql_no_cache a, last_insert_id() FROM t1 WHERE a IS NULL; +a last_insert_id() +1 1 +SELECT sql_no_cache a, last_insert_id() FROM t1 WHERE a IS NULL; +a last_insert_id() +SELECT sql_no_cache a, last_insert_id() FROM t1; +a last_insert_id() +1 1 +DROP TABLE t1; |