diff options
| author | Patrick Crews <patrick.crews@sun.com> | 2009-03-09 13:45:40 -0400 |
|---|---|---|
| committer | Patrick Crews <patrick.crews@sun.com> | 2009-03-09 13:45:40 -0400 |
| commit | b69c44a91c097df73f4a7eda6f4e6eec749e99e8 (patch) | |
| tree | 1bfb9389f5dbdc09ff423e7a47f2f3ad3dc2bb04 | |
| parent | 4976ec08a328992210746815d9d98e022c337f3a (diff) | |
| parent | 1c39d5ff8fa695573907505996b6c09e7d3d1261 (diff) | |
| download | mariadb-git-b69c44a91c097df73f4a7eda6f4e6eec749e99e8.tar.gz | |
merge 5.0 -> 5.1
| -rw-r--r-- | mysql-test/suite/funcs_1/r/innodb_func_view.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/funcs_1/r/innodb_views.result | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/suite/funcs_1/r/innodb_func_view.result b/mysql-test/suite/funcs_1/r/innodb_func_view.result index 1547c5461be..4beb0c8aaf2 100644 --- a/mysql-test/suite/funcs_1/r/innodb_func_view.result +++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result @@ -5245,7 +5245,7 @@ WHERE select_id = 1 OR select_id IS NULL order by id; sqrt(my_bigint) my_bigint id NULL NULL 1 NULL -9223372036854775808 2 -3037000499.976 9223372036854775807 3 +3037000499.97605 9223372036854775807 3 0 0 4 NULL -1 5 2 4 6 @@ -5259,7 +5259,7 @@ WHERE select_id = 1 OR select_id IS NULL) order by id; sqrt(my_bigint) my_bigint id NULL NULL 1 NULL -9223372036854775808 2 -3037000499.976 9223372036854775807 3 +3037000499.97605 9223372036854775807 3 0 0 4 NULL -1 5 2 4 6 diff --git a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result index d42b04de697..a335e135a4f 100644 --- a/mysql-test/suite/funcs_1/r/innodb_views.result +++ b/mysql-test/suite/funcs_1/r/innodb_views.result @@ -22824,7 +22824,7 @@ f1 f2 ABC 3 SELECT * FROM v1 order by 2; f1 my_sqrt -ABC 1.7320508075689 +ABC 1.73205080756888 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30); INSERT INTO t1 SET f1 = 'ABC', f2 = 'DEF'; DESCRIBE t1; @@ -22842,7 +22842,7 @@ ABC DEF SELECT * FROM v1 order by 2; f1 my_sqrt ABC 0 -ABC 1.7320508075689 +ABC 1.73205080756888 SELECT SQRT('DEF'); SQRT('DEF') 0 @@ -22862,7 +22862,7 @@ my_sqrt double YES NULL SELECT * FROM v2 order by 2; f1 my_sqrt ABC 0 -ABC 1.7320508075689 +ABC 1.73205080756888 CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1; SELECT * FROM t2 order by 2; f1 ABC |