diff options
| author | unknown <kaa@polly.local> | 2006-09-25 12:52:01 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-09-25 12:52:01 +0400 |
| commit | 06e9a32bfb5092464a5e48c2610bcf95666e2b11 (patch) | |
| tree | 80f32b097bb9e4aa72a2526b578a66dc64fea0bf /mysql-test/r/strict.result | |
| parent | a8bd76a0c14d306d3701ce248091d7c5e223ddb4 (diff) | |
| parent | 0fca1e8b38d074c32cebf45b3242943902219d90 (diff) | |
| download | mariadb-git-06e9a32bfb5092464a5e48c2610bcf95666e2b11.tar.gz | |
Merge polly.local:/tmp/22129/bug22129/my50-bug22129
into polly.local:/tmp/22129/bug22129/my51-bug22129
mysql-test/r/strict.result:
Auto merged
Diffstat (limited to 'mysql-test/r/strict.result')
| -rw-r--r-- | mysql-test/r/strict.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result index 25475b8cd45..13ad8ec16d5 100644 --- a/mysql-test/r/strict.result +++ b/mysql-test/r/strict.result @@ -925,10 +925,10 @@ Warning 1264 Out of range value for column 'col2' at row 1 Warning 1264 Out of range value for column 'col2' at row 1 SELECT * FROM t1; col1 col2 -0 0 +-2.2e-307 0 1e-303 0 1.7e+308 1.7e+308 -0 0 +-2.2e-307 0 -2e-307 0 1.7e+308 1.7e+308 0 NULL |