diff options
| author | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-05-07 22:20:42 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-05-07 22:20:42 +0200 |
| commit | ad1e123f478e170cdbed5fd0e6a58277e61326ad (patch) | |
| tree | fd4bc4e87a0385cd676cd34fe9ba93dd57358f2e /mysql-test/t/subselect.test | |
| parent | 066dc9a281ee8932827f7e6180dd0fa1bfe5d922 (diff) | |
| parent | 582b7283472a43af5d7fb51386df055ea9d44a96 (diff) | |
| download | mariadb-git-ad1e123f478e170cdbed5fd0e6a58277e61326ad.tar.gz | |
Merge 5.5.24 back into main 5.5.
This is a weave merge, but without any conflicts.
In 14 source files, the copyright year needed to be updated to 2012.
Diffstat (limited to 'mysql-test/t/subselect.test')
| -rw-r--r-- | mysql-test/t/subselect.test | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test index 3e4fc8484aa..fa63340a718 100644 --- a/mysql-test/t/subselect.test +++ b/mysql-test/t/subselect.test @@ -4122,4 +4122,14 @@ SELECT 1 FROM DROP TABLE t1; +--echo # +--echo # Bug#13721076 CRASH WITH TIME TYPE/TIMESTAMP() AND WARNINGS IN SUBQUERY +--echo # + +CREATE TABLE t1(a TIME NOT NULL); +INSERT INTO t1 VALUES ('00:00:32'); +SELECT 1 FROM t1 WHERE a > +(SELECT timestamp(a) AS a FROM t1); + +DROP TABLE t1; |