summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorsergefp@mysql.com <>2004-12-30 14:56:31 +0300
committersergefp@mysql.com <>2004-12-30 14:56:31 +0300
commit27e0f12ff1a2939a978f5973516d80666158f4d4 (patch)
tree5e9e10e3cc842a6895a0f750c41c84c635d57224 /mysql-test
parent2aa98f89aaaad9b386c1712a03efa2ec9e9e93b4 (diff)
downloadmariadb-git-27e0f12ff1a2939a978f5973516d80666158f4d4.tar.gz
Fix func_concat.result: allow -0.00 to be converted to string both with and without leading minus
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/func_concat.result6
-rw-r--r--mysql-test/t/func_concat.test4
2 files changed, 3 insertions, 7 deletions
diff --git a/mysql-test/r/func_concat.result b/mysql-test/r/func_concat.result
index 0bd53b32dd7..cf6fbf2da4f 100644
--- a/mysql-test/r/func_concat.result
+++ b/mysql-test/r/func_concat.result
@@ -63,8 +63,4 @@ a0
select 'a' union select concat('a', -0.0);
a
a
-a0.0
-select 'a' union select concat('a', -0.0000);
-a
-a
-a0.0000
+good
diff --git a/mysql-test/t/func_concat.test b/mysql-test/t/func_concat.test
index 78818cdda4e..b94901e9966 100644
--- a/mysql-test/t/func_concat.test
+++ b/mysql-test/t/func_concat.test
@@ -46,7 +46,7 @@ select 'a' union select concat('a', -'3');
select 'a' union select concat('a', -concat('3',4));
select 'a' union select concat('a', -0);
-select 'a' union select concat('a', -0.0);
-select 'a' union select concat('a', -0.0000);
+--replace_result 'a-0.0' good 'a0.0' good
+select 'a' union select concat('a', -0.0);