diff options
| author | Michael Widenius <monty@mysql.com> | 2009-04-25 12:04:38 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2009-04-25 12:04:38 +0300 |
| commit | 210a412522b10115d34b431c66acf403faab7bfe (patch) | |
| tree | 56c09cfd1053265897d114e4acb52d395185f27e /mysql-test/r/func_str.result | |
| parent | 059b9356a19118a48fbad31be81c4859e15d3bc8 (diff) | |
| parent | 4aeeb1d157a67c5359475d8941267641fb894b22 (diff) | |
| download | mariadb-git-210a412522b10115d34b431c66acf403faab7bfe.tar.gz | |
bzr merge from guilhem's maria tree to our local 5.1
configure.in:
Manually merged
mysql-test/lib/My/ConfigFactory.pm:
Manually merged
mysql-test/mysql-test-run.pl:
Manually merged
mysql-test/t/information_schema.test:
Manually merged
sql/handler.cc:
Manually merged
support-files/mysql.spec.sh:
Manually merged
Diffstat (limited to 'mysql-test/r/func_str.result')
| -rw-r--r-- | mysql-test/r/func_str.result | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index 0824f13cafc..00c98ad136c 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -1351,10 +1351,10 @@ cast(rtrim(ltrim(' 20.06 ')) as decimal(19,2)) 20.06 select conv("18383815659218730760",10,10) + 0; conv("18383815659218730760",10,10) + 0 -1.8383815659219e+19 +1.83838156592187e+19 select "18383815659218730760" + 0; "18383815659218730760" + 0 -1.8383815659219e+19 +1.83838156592187e+19 CREATE TABLE t1 (code varchar(10)); INSERT INTO t1 VALUES ('a12'), ('A12'), ('a13'); SELECT ASCII(code), code FROM t1 WHERE code='A12'; @@ -2519,4 +2519,10 @@ 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 |