diff options
author | unknown <evgen@moonbone.local> | 2005-06-23 01:02:43 +0400 |
---|---|---|
committer | unknown <evgen@moonbone.local> | 2005-06-23 01:02:43 +0400 |
commit | f3a3e052491f7e1ac1d759cb1498a28863dc51ee (patch) | |
tree | 2eb5c9308d86de24da712c95e1f909985b459694 /mysql-test | |
parent | bbc0211304fe7beb47fef9f188e413effeea4470 (diff) | |
parent | 285e348c1fc1705aa54023685a62b6689ba74c29 (diff) | |
download | mariadb-git-f3a3e052491f7e1ac1d759cb1498a28863dc51ee.tar.gz |
Bug #9728 fix merge
mysql-test/r/insert_select.result:
Auto merged
mysql-test/t/insert_select.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_base.cc:
Manual merge
sql/sql_parse.cc:
Manual merge
sql/sql_yacc.yy:
Manual merge
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/README | 13 | ||||
-rw-r--r-- | mysql-test/r/insert_select.result | 15 | ||||
-rw-r--r-- | mysql-test/t/insert_select.test | 14 |
3 files changed, 40 insertions, 2 deletions
diff --git a/mysql-test/README b/mysql-test/README index 65e6186613a..10d64784ed4 100644 --- a/mysql-test/README +++ b/mysql-test/README @@ -2,8 +2,17 @@ This directory contains a test suite for mysql daemon. To run the currently existing test cases, simply execute ./mysql-test-run in this directory. It will fire up the newly built mysqld and test it. -If you want to run the test with a running MySQL server use the --external -option to mysql-test-run. +If you want to run a test with a running MySQL server use the --extern +option to mysql-test-run. Please note that in this mode the test suite +expects user to specify test names to run. Otherwise it falls back to the +normal "non-extern" behaviour. The reason is that some tests +could not run with external server. Here is the sample command +to test "alias" and "analyze" tests on external server: + +mysql-test-run --extern alias analyze + +To match your setup you might also need to provide --socket, --user and +other relevant options. Note that you do not have to have to do make install, and you could actually have a co-existing MySQL installation - the tests will not diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result index 11384b0feff..026dae8381a 100644 --- a/mysql-test/r/insert_select.result +++ b/mysql-test/r/insert_select.result @@ -634,3 +634,18 @@ ff1 ff2 1 2 2 1 drop table t1, t2; +create table t1 (a int unique); +create table t2 (a int, b int); +insert into t1 values (1),(2); +insert into t2 values (1,2); +select * from t1; +a +1 +2 +insert into t1 select t2.a from t2 on duplicate key update a= a + t2.b; +select * from t1; +a +2 +3 +drop table t1; +drop table t2; diff --git a/mysql-test/t/insert_select.test b/mysql-test/t/insert_select.test index 834561ed5f7..a6468c52645 100644 --- a/mysql-test/t/insert_select.test +++ b/mysql-test/t/insert_select.test @@ -173,3 +173,17 @@ insert into t1 values (1),(1),(2); insert into t2(ff1) select f1 from t1 on duplicate key update ff2=ff2+1; select * from t2; drop table t1, t2; +# +# BUGS #9728 - 'Decreased functionality in "on duplicate key update"' +# #8147 - 'a column proclaimed ambigous in INSERT ... SELECT .. ON +# DUPLICATE' +# +create table t1 (a int unique); +create table t2 (a int, b int); +insert into t1 values (1),(2); +insert into t2 values (1,2); +select * from t1; +insert into t1 select t2.a from t2 on duplicate key update a= a + t2.b; +select * from t1; +drop table t1; +drop table t2; |