diff options
| author | unknown <sergefp@pylon.mylan> | 2007-09-11 02:24:08 +0400 |
|---|---|---|
| committer | unknown <sergefp@pylon.mylan> | 2007-09-11 02:24:08 +0400 |
| commit | 9d466ad4791ef95d9201506099f2e6684d3d4b91 (patch) | |
| tree | 0176beafdda7144ed0ab8ca49f84622901964b6b /mysql-test/r/delete.result | |
| parent | 76e37a32b8a3c7c74a2cbee8b292632a4c04fb3d (diff) | |
| parent | 732f05a642279a569c6ed2b67fafff05b9de76c3 (diff) | |
| download | mariadb-git-9d466ad4791ef95d9201506099f2e6684d3d4b91.tar.gz | |
Merge mysql.com:/home/psergey/mysql-4.1-bug30385
into mysql.com:/home/psergey/mysql-5.0-bug30385
sql/opt_range.cc:
Auto merged
mysql-test/r/delete.result:
Manual merge
mysql-test/t/delete.test:
Manual merge
Diffstat (limited to 'mysql-test/r/delete.result')
| -rw-r--r-- | mysql-test/r/delete.result | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/delete.result b/mysql-test/r/delete.result index d333425f23a..a3ba61c9046 100644 --- a/mysql-test/r/delete.result +++ b/mysql-test/r/delete.result @@ -183,6 +183,18 @@ select @a; @a 1 drop table t1; +CREATE TABLE t1 ( +`date` date , +`time` time , +`seq` int(10) unsigned NOT NULL auto_increment, +PRIMARY KEY (`seq`), +KEY `seq` (`seq`), +KEY `time` (`time`), +KEY `date` (`date`) +); +DELETE FROM t1 ORDER BY date ASC, time ASC LIMIT 1; +drop table t1; +End of 4.1 tests End of 4.1 tests CREATE TABLE t1 (a int not null,b int not null); CREATE TABLE t2 (a int not null, b int not null, primary key (a,b)); |