diff options
| author | unknown <mskold@mysql.com> | 2006-03-23 22:39:30 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2006-03-23 22:39:30 +0100 |
| commit | ff8f4ca4968053e5ef4d227721915db4b05f44f7 (patch) | |
| tree | 663cd6576766a904a568b03694fc5fac1783e4b7 /mysql-test/r/ndb_replace.result | |
| parent | c22e3f99619f82517f9331867b721ae0fbf30d48 (diff) | |
| parent | ef27bd8aac6e861a914c51c3c9dc4657f5302dfd (diff) | |
| download | mariadb-git-ff8f4ca4968053e5ef4d227721915db4b05f44f7.tar.gz | |
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
mysql-test/r/ndb_insert.result:
Auto merged
mysql-test/r/ndb_replace.result:
Auto merged
storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Keeping local and do manual merge
sql/ha_ndbcluster.h:
Keeping local and do hand merge
Diffstat (limited to 'mysql-test/r/ndb_replace.result')
| -rw-r--r-- | mysql-test/r/ndb_replace.result | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/ndb_replace.result b/mysql-test/r/ndb_replace.result index 6aa1a387661..5e49968ca64 100644 --- a/mysql-test/r/ndb_replace.result +++ b/mysql-test/r/ndb_replace.result @@ -19,3 +19,15 @@ gesuchnr benutzer_id 2 1 3 2 drop table t1; +CREATE TABLE t1(i INT PRIMARY KEY AUTO_INCREMENT, +j INT, +k INT, +UNIQUE INDEX(j) +) ENGINE = ndb; +INSERT INTO t1 VALUES (1,1,23),(2,2,24); +REPLACE INTO t1 (j,k) VALUES (1,42); +REPLACE INTO t1 (i,j) VALUES (17,2); +SELECT * from t1 ORDER BY i; +i j k +3 1 42 +17 2 24 |