diff options
| author | lars@mysql.com <> | 2006-06-28 16:18:57 +0200 |
|---|---|---|
| committer | lars@mysql.com <> | 2006-06-28 16:18:57 +0200 |
| commit | 6036c30b5711953bbb984d82839f990c1868aff0 (patch) | |
| tree | 80526207fd879fcf663e5df54158d1fe6280018c /mysql-test/r | |
| parent | 18e008a1ba9cee7ab89096ccf216a9db676a5314 (diff) | |
| parent | 10abc3e244f4423af9c38fecb81c93a6ed2c86fe (diff) | |
| download | mariadb-git-6036c30b5711953bbb984d82839f990c1868aff0.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/ndb_replace.result | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/mysql-test/r/ndb_replace.result b/mysql-test/r/ndb_replace.result index 5d772620b2c..cdfcd6a7a43 100644 --- a/mysql-test/r/ndb_replace.result +++ b/mysql-test/r/ndb_replace.result @@ -1,4 +1,4 @@ -drop table if exists t1; +drop table if exists t1,t2; CREATE TABLE t1 ( gesuchnr int(11) DEFAULT '0' NOT NULL, benutzer_id int(11) DEFAULT '0' NOT NULL, @@ -31,3 +31,24 @@ SELECT * from t1 ORDER BY i; i j k 3 1 42 17 2 24 +CREATE TABLE t2 (a INT(11) NOT NULL, +b INT(11) NOT NULL, +c INT(11) NOT NULL, +x TEXT, +y TEXT, +z TEXT, +id INT(10) unsigned NOT NULL AUTO_INCREMENT, +i INT(11) DEFAULT NULL, +PRIMARY KEY (id), +UNIQUE KEY a (a,b,c) +) ENGINE=ndbcluster; +REPLACE INTO t2 (a,b,c,x,y,z,i) VALUES (1,1,1,'a','a','a',1),(1,1,1,'b','b','b',2), (1,1,1,'c','c','c',3); +SELECT * FROM t2 ORDER BY id; +a b c x y z id i +1 1 1 c c c 3 3 +REPLACE INTO t2(a,b,c,x,y,z,i) values (1,1,1,'a','a','a',1); +REPLACE INTO t2(a,b,c,x,y,z,i) values (1,1,1,'b','b','b',2); +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; |