summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <igor@olga.mysql.com>2007-02-13 15:49:42 -0800
committerunknown <igor@olga.mysql.com>2007-02-13 15:49:42 -0800
commit5ecad9a57f45378e6b073657f7e507e916be4dd4 (patch)
treeb5fdd4328c31ab0ebcdbce41c383764d543e9669
parentcfe1a891b3b0842c7332121edda4a93e250fe6a5 (diff)
downloadmariadb-git-5ecad9a57f45378e6b073657f7e507e916be4dd4.tar.gz
Post-merge fix
-rw-r--r--mysql-test/r/select.result1
-rw-r--r--mysql-test/t/select.test1
2 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 3c4df47ca7b..f50f4859d48 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -3786,4 +3786,3 @@ coalesce(cast(1111111111111111111 as unsigned), 1) co;
i c co
1111111111111111111 1111111111111111111 1111111111111111111
End of 5.0 tests
-
diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index 4cdceff6755..c4737814137 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -3254,4 +3254,3 @@ select
coalesce(cast(1111111111111111111 as unsigned), 1) co;
--echo End of 5.0 tests
-