diff options
author | unknown <monty@mysql.com> | 2004-03-25 23:29:45 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-03-25 23:29:45 +0200 |
commit | 526b25e2633bbc44b867b548f5c7f633517e5b0f (patch) | |
tree | 7815fb40163d1db39e3991dcd19341ef57d08d74 /mysql-test/t/update.test | |
parent | f6e33d67e1132a18e7a6ab49c2b6ff00da5112c8 (diff) | |
parent | 922818a79809d789976e64a8b4faabd305863a7c (diff) | |
download | mariadb-git-526b25e2633bbc44b867b548f5c7f633517e5b0f.tar.gz |
Merge with 4.0
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-libmysql.def~f5dffcb3ed925d28:
Auto merged
BitKeeper/deleted/.del-post-incoming~9f2168f531f09f3b:
Auto merged
BitKeeper/deleted/.del-post-outgoing~1dd3d8f0f6e8f3cd:
Auto merged
VC++Files/innobase/innobase.dsp:
Auto merged
VC++Files/strings/MASM6x/strings.dsp:
Auto merged
client/mysqldump.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/t/union.test:
Auto merged
mysql-test/t/update.test:
Auto merged
mysys/mf_iocache.c:
Auto merged
sql/nt_servc.cc:
Auto merged
mysql-test/r/system_mysql_db.result:
Auto merged
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/update.test')
-rw-r--r-- | mysql-test/t/update.test | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/t/update.test b/mysql-test/t/update.test index 3406dfd6158..6ca75cf0c26 100644 --- a/mysql-test/t/update.test +++ b/mysql-test/t/update.test @@ -125,7 +125,6 @@ insert into t1 (F1,F2,F3,cnt,groupid) values ('0','0','0',1,6), ('0','1','2',1,5), ('0','2','0',1,3), ('1','0','1',1,2), ('1','2','1',1,1), ('1','2','2',1,1), ('2','0','1',2,4), ('2','2','0',1,7); - delete from m1 using t1 m1,t1 m2 where m1.groupid=m2.groupid and (m1.cnt < m2.cnt or m1.cnt=m2.cnt and m1.F3>m2.F3); select * from t1; drop table t1; |