diff options
author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-02-06 12:53:20 +0300 |
---|---|---|
committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-02-06 12:53:20 +0300 |
commit | a8c98eb9533463e8298961f3754ea7cc071545ce (patch) | |
tree | 68fc22dffa8993f8c6f8582948f2e672ec80dd08 /mysql-test/r/func_str.result | |
parent | 4cd0e2fac4ad4c9218f24bb42b299700c2ed777f (diff) | |
parent | b30239bc1a3e73f4ad4f1ecac9cc1e193f7a0b61 (diff) | |
download | mariadb-git-a8c98eb9533463e8298961f3754ea7cc071545ce.tar.gz |
Merge mysql-5.0-bugteam -> mysql-5.1-bugteam.
Diffstat (limited to 'mysql-test/r/func_str.result')
-rw-r--r-- | mysql-test/r/func_str.result | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index e73d320596d..0824f13cafc 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -2519,10 +2519,4 @@ def format(a, 2) 253 49 4 Y 0 31 8 format(a, 2) 1.33 drop table t1; -CREATE TABLE t1 (c DATE, aa VARCHAR(30)); -INSERT INTO t1 VALUES ('2008-12-31','aaaaaa'); -SELECT DATE_FORMAT(c, GET_FORMAT(DATE, 'eur')) h, CONCAT(UPPER(aa),', ', aa) i FROM t1; -h i -31.12.2008 AAAAAA, aaaaaa -DROP TABLE t1; End of 5.0 tests |