diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-14 17:04:45 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-14 17:04:45 +0200 |
| commit | f3a731cadd96a08395210e201d63a85b018896a2 (patch) | |
| tree | 5d2eeb6a9fb0b831bce583b40626468473f9bc0a /mysql-test/r/order_by.result | |
| parent | f0c50440966778b8e084f2ab6f9119dc177a4da7 (diff) | |
| parent | ff810fb952f5f104337ea2614c96387e4c44918c (diff) | |
| download | mariadb-git-f3a731cadd96a08395210e201d63a85b018896a2.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/autopush/B26794-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B26794-merge-5.1-opt
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/field.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/alter_table.result:
merged 5.0-opt -> 5.1-opt
mysql-test/r/gis-rtree.result:
merged 5.0-opt -> 5.1-opt
mysql-test/r/order_by.result:
merged 5.0-opt -> 5.1-opt
mysql-test/r/subselect.result:
merged 5.0-opt -> 5.1-opt
mysql-test/t/alter_table.test:
merged 5.0-opt -> 5.1-opt
mysql-test/t/order_by.test:
merged 5.0-opt -> 5.1-opt
mysql-test/t/subselect.test:
merged 5.0-opt -> 5.1-opt
Diffstat (limited to 'mysql-test/r/order_by.result')
| -rw-r--r-- | mysql-test/r/order_by.result | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result index 8a19cfcded2..c7adfb784de 100644 --- a/mysql-test/r/order_by.result +++ b/mysql-test/r/order_by.result @@ -958,6 +958,28 @@ a ratio 19 1.3333 9 2.6667 drop table t1; +CREATE TABLE t1 (a INT UNSIGNED NOT NULL, b TIME); +INSERT INTO t1 (a) VALUES (100000), (0), (100), (1000000),(10000), (1000), (10); +UPDATE t1 SET b = SEC_TO_TIME(a); +SELECT a, b FROM t1 ORDER BY b DESC; +a b +1000000 277:46:40 +100000 27:46:40 +10000 02:46:40 +1000 00:16:40 +100 00:01:40 +10 00:00:10 +0 00:00:00 +SELECT a, b FROM t1 ORDER BY SEC_TO_TIME(a) DESC; +a b +1000000 277:46:40 +100000 27:46:40 +10000 02:46:40 +1000 00:16:40 +100 00:01:40 +10 00:00:10 +0 00:00:00 +DROP TABLE t1; CREATE TABLE t1 (a INT, b INT, PRIMARY KEY (a), UNIQUE KEY b (b)); INSERT INTO t1 VALUES (1,1),(2,2); CREATE TABLE t2 (a INT, b INT, KEY a (a,b)); |