diff options
| author | unknown <mskold@mysql.com> | 2004-11-04 10:43:52 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2004-11-04 10:43:52 +0100 |
| commit | 80051fa3b622651608506c408e08bc8458158784 (patch) | |
| tree | 9559b129e09ba8bdce516139eff61cd727a33768 /mysql-test | |
| parent | 7fd0cc2d1265ac425e602f24894005539468c429 (diff) | |
| parent | 9caa9f9cd3bd74ecf244dccd3330533563a3360d (diff) | |
| download | mariadb-git-80051fa3b622651608506c408e08bc8458158784.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ndb_basic.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/ndb_basic.test | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/ndb_basic.result b/mysql-test/r/ndb_basic.result index 604084a72c2..ba8ee820ad9 100644 --- a/mysql-test/r/ndb_basic.result +++ b/mysql-test/r/ndb_basic.result @@ -40,6 +40,11 @@ SELECT * FROM t1 ORDER BY pk1; pk1 attr1 attr2 attr3 3 1 NULL 9412 9412 9413 17 9413 +UPDATE t1 SET pk1=4 WHERE pk1 = 3; +SELECT * FROM t1 ORDER BY pk1; +pk1 attr1 attr2 attr3 +4 1 NULL 9412 +9412 9413 17 9413 DELETE FROM t1; SELECT * FROM t1; pk1 attr1 attr2 attr3 diff --git a/mysql-test/t/ndb_basic.test b/mysql-test/t/ndb_basic.test index f5bed3dcdff..b62d2a8e0e1 100644 --- a/mysql-test/t/ndb_basic.test +++ b/mysql-test/t/ndb_basic.test @@ -36,6 +36,8 @@ UPDATE t1 SET pk1=2 WHERE attr1=1; SELECT * FROM t1 ORDER BY pk1; UPDATE t1 SET pk1=pk1 + 1; SELECT * FROM t1 ORDER BY pk1; +UPDATE t1 SET pk1=4 WHERE pk1 = 3; +SELECT * FROM t1 ORDER BY pk1; # Delete the record DELETE FROM t1; |