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_insert.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_insert.result')
| -rw-r--r-- | mysql-test/r/ndb_insert.result | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/mysql-test/r/ndb_insert.result b/mysql-test/r/ndb_insert.result index 11d322a06de..1da958ef0f7 100644 --- a/mysql-test/r/ndb_insert.result +++ b/mysql-test/r/ndb_insert.result @@ -577,6 +577,25 @@ pk1 b c 2 2 17 4 4 3 6 6 3 +DELETE FROM t1; +CREATE UNIQUE INDEX bi ON t1(b); +INSERT INTO t1 VALUES +(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5), +(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10); +INSERT INTO t1 VALUES(0,1,0),(21,21,21) ON DUPLICATE KEY UPDATE pk1=b+10,b=b+10; +select * from t1 order by pk1; +pk1 b c +2 2 2 +3 3 3 +4 4 4 +5 5 5 +6 6 6 +7 7 7 +8 8 8 +9 9 9 +10 10 10 +11 11 1 +21 21 21 DROP TABLE t1; CREATE TABLE t1(a INT) ENGINE=ndb; INSERT IGNORE INTO t1 VALUES (1); @@ -586,7 +605,7 @@ INSERT IGNORE INTO t1 SELECT a FROM t1; INSERT IGNORE INTO t1 SELECT a FROM t1; INSERT IGNORE INTO t1 VALUES (1); INSERT IGNORE INTO t1 VALUES (1); -SELECT * FROM t1; +SELECT * FROM t1 ORDER BY a; a 1 1 @@ -606,4 +625,11 @@ a 1 1 1 +DELETE FROM t1; +CREATE UNIQUE INDEX ai ON t1(a); +INSERT IGNORE INTO t1 VALUES (1); +INSERT IGNORE INTO t1 VALUES (1); +SELECT * FROM t1 ORDER BY a; +a +1 DROP TABLE t1; |