diff options
| author | unknown <dlenev@mysql.com> | 2006-07-02 02:12:53 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2006-07-02 02:12:53 +0400 |
| commit | d6d5501b9860a2335184a016ee65714dcc8d3563 (patch) | |
| tree | 6997be64d5327fe58acf2e694155bdcea954f13c /mysql-test/r/ndb_replace.result | |
| parent | dee303e266d2fbe69a70906d474985e5fd5234d0 (diff) | |
| parent | ac95707036e28f573384a44c90bbc78e78c052b1 (diff) | |
| download | mariadb-git-d6d5501b9860a2335184a016ee65714dcc8d3563.tar.gz | |
Merge mysql.com:/home/dlenev/mysql-5.0-bg18437-3
into mysql.com:/home/dlenev/mysql-5.1-bg18437
sql/mysql_priv.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
include/my_base.h:
Manual merge.
mysql-test/r/federated.result:
Manual merge.
mysql-test/r/ndb_replace.result:
Manual merge.
mysql-test/t/federated.test:
Manual merge.
sql/ha_ndbcluster.cc:
Manual merge.
sql/item.cc:
Manual merge.
sql/sql_delete.cc:
Manual merge.
sql/sql_insert.cc:
Manual merge.
sql/sql_parse.cc:
Manual merge.
sql/sql_trigger.h:
Manual merge.
sql/sql_update.cc:
Manual merge.
Diffstat (limited to 'mysql-test/r/ndb_replace.result')
| -rw-r--r-- | mysql-test/r/ndb_replace.result | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/mysql-test/r/ndb_replace.result b/mysql-test/r/ndb_replace.result index 8e85feb3bd3..23844ce3bff 100644 --- a/mysql-test/r/ndb_replace.result +++ b/mysql-test/r/ndb_replace.result @@ -31,6 +31,7 @@ SELECT * from t1 ORDER BY i; i j k 3 1 42 17 2 NULL +DROP TABLE t1; CREATE TABLE t2 (a INT(11) NOT NULL, b INT(11) NOT NULL, c INT(11) NOT NULL, @@ -52,3 +53,47 @@ SELECT * FROM t2 ORDER BY id; a b c x y z id i 1 1 1 b b b 5 2 DROP TABLE t2; +drop table if exists t1; +create table t1 (pk int primary key, apk int unique, data int) engine=ndbcluster; +insert into t1 values (1, 1, 1), (2, 2, 2), (3, 3, 3); +replace into t1 (pk, apk) values (4, 1), (5, 2); +select * from t1 order by pk; +pk apk data +3 3 3 +4 1 NULL +5 2 NULL +delete from t1; +insert into t1 values (1, 1, 1), (2, 2, 2), (3, 3, 3); +replace into t1 (pk, apk) values (1, 4), (2, 5); +select * from t1 order by pk; +pk apk data +1 4 NULL +2 5 NULL +3 3 3 +delete from t1; +insert into t1 values (1, 1, 1), (4, 4, 4), (6, 6, 6); +load data infile '../std_data_ln/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (pk, apk); +select * from t1 order by pk; +pk apk data +1 1 1 +3 4 NULL +5 6 NULL +delete from t1; +insert into t1 values (1, 1, 1), (3, 3, 3), (5, 5, 5); +load data infile '../std_data_ln/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (pk, apk); +select * from t1 order by pk; +pk apk data +1 1 1 +3 4 NULL +5 6 NULL +delete from t1; +insert into t1 values (1, 1, 1), (2, 2, 2), (3, 3, 3); +replace into t1 (pk, apk) select 4, 1; +replace into t1 (pk, apk) select 2, 4; +select * from t1 order by pk; +pk apk data +2 4 NULL +3 3 3 +4 1 NULL +drop table t1; +End of 5.0 tests. |