diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-10-29 15:16:53 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-10-29 15:16:53 +0100 |
| commit | 2e5450af052040848042c6eae4f03efa23c5f8fc (patch) | |
| tree | 0f2d695372c7aae8fc5ea63cf78f57475c297de2 /mysql-test/suite | |
| parent | 17cf27f5b61aace463c3ae52df54c2363d2d4ca8 (diff) | |
| parent | d6302c9a47615019a3bca5304d3f61c587d826b8 (diff) | |
| download | mariadb-git-2e5450af052040848042c6eae4f03efa23c5f8fc.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/div_precision_increment_func.result | 16 | ||||
| -rw-r--r-- | mysql-test/suite/vcol/r/not_supported.result | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/suite/sys_vars/r/div_precision_increment_func.result b/mysql-test/suite/sys_vars/r/div_precision_increment_func.result index e16ce76fed9..c839dd6b289 100644 --- a/mysql-test/suite/sys_vars/r/div_precision_increment_func.result +++ b/mysql-test/suite/sys_vars/r/div_precision_increment_func.result @@ -51,9 +51,9 @@ INSERT into t1(name, salary, income_tax) values('Record_2', 501, 501*2.5/1000); INSERT into t1(name, salary, income_tax) values('Record_3', 210, 210*2.5/1000); SELECT * from t1; id name salary income_tax -1 Record_1 100011 250.03 -2 Record_2 501 1.25 -3 Record_3 210 0.53 +1 Record_1 100011 250.027 +2 Record_2 501 1.2525 +3 Record_3 210 0.525 connect test_con2, localhost, root,,; connection test_con2; ## Verifying session & global value of variable ## @@ -69,11 +69,11 @@ INSERT into t1(name, salary, income_tax) values('Record_5', 501, 501*2.5/1000); INSERT into t1(name, salary, income_tax) values('Record_6', 210, 210*2.5/1000); SELECT * from t1; id name salary income_tax -1 Record_1 100011 250.03 -2 Record_2 501 1.25 -3 Record_3 210 0.53 -4 Record_4 100011 250.028 -5 Record_5 501 1.253 +1 Record_1 100011 250.027 +2 Record_2 501 1.2525 +3 Record_3 210 0.525 +4 Record_4 100011 250.027 +5 Record_5 501 1.2525 6 Record_6 210 0.525 ## Dropping table t1 ## drop table t1; diff --git a/mysql-test/suite/vcol/r/not_supported.result b/mysql-test/suite/vcol/r/not_supported.result index c524234e7e5..c804cf220d2 100644 --- a/mysql-test/suite/vcol/r/not_supported.result +++ b/mysql-test/suite/vcol/r/not_supported.result @@ -29,7 +29,7 @@ set time_zone='+1:00'; flush tables; select * from t1; a b v -1 2 0.3333000000000000000 +1 2 0.3333333330000000000 select * from t8; a b v 1234567890 2 2009-02-14 00:31:30 |