diff options
author | unknown <tomas@poseidon.ndb.mysql.com> | 2008-02-11 17:38:34 +0100 |
---|---|---|
committer | unknown <tomas@poseidon.ndb.mysql.com> | 2008-02-11 17:38:34 +0100 |
commit | 1be0f4f0bc4fcb39076d622b09cf65086793db58 (patch) | |
tree | ff290c4670a43599af0283ca8563d1350db80ff3 /mysql-test/suite/ndb/r/ndb_auto_increment.result | |
parent | 9c99798b7550526d70095a421cf361d9901d9697 (diff) | |
parent | 8dc4b6dceb05373bf33234a318691f8eb2cb3524 (diff) | |
download | mariadb-git-1be0f4f0bc4fcb39076d622b09cf65086793db58.tar.gz |
Merge poseidon.ndb.mysql.com:/home/tomas/cge-5.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
Auto merged
Diffstat (limited to 'mysql-test/suite/ndb/r/ndb_auto_increment.result')
-rw-r--r-- | mysql-test/suite/ndb/r/ndb_auto_increment.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/ndb/r/ndb_auto_increment.result b/mysql-test/suite/ndb/r/ndb_auto_increment.result index 5740ed38242..78612b35113 100644 --- a/mysql-test/suite/ndb/r/ndb_auto_increment.result +++ b/mysql-test/suite/ndb/r/ndb_auto_increment.result @@ -421,10 +421,10 @@ select * from t1 order by a; a 1 20 -21 33 34 35 +65 insert into t1 values (100); insert into t1 values (NULL); insert into t1 values (NULL); @@ -432,11 +432,11 @@ select * from t1 order by a; a 1 20 -21 -22 33 34 35 +65 +66 100 101 set auto_increment_offset = @old_auto_increment_offset; |