summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <monty@work.mysql.com>2001-05-31 12:56:05 +0200
committerunknown <monty@work.mysql.com>2001-05-31 12:56:05 +0200
commite6ecbfd629bf92c84f270119405f4796464e7f4e (patch)
tree7fc3c8f38fbab4a3cef1388c3bc2e53b0455c75c /mysql-test
parenta14542a61fbaabf30a2735a74401e4cd2734314d (diff)
parent8c8244918fc37bb25656a5f8b451a362e4b16577 (diff)
downloadmariadb-git-e6ecbfd629bf92c84f270119405f4796464e7f4e.tar.gz
merge
BitKeeper/triggers/post-commit: Auto merged acinclude.m4: Auto merged configure.in: Auto merged Docs/manual.texi: Auto merged include/my_sys.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged sql/mysqld.cc: Auto merged sql/sql_base.cc: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_table.cc: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/mysql-test-run.sh5
-rw-r--r--mysql-test/r/func_test.result2
-rw-r--r--mysql-test/t/func_test.test10
3 files changed, 15 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 368ab69509d..969255d5e6e 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -310,8 +310,9 @@ show_failed_diff ()
echo "-------------------------------------------------------"
$DIFF -c $result_file $reject_file
echo "-------------------------------------------------------"
- echo "Please e-mail the above, along with the output of mysqlbug"
- echo "and any other relevant info to bugs@lists.mysql.com"
+ echo "Please follow the instructions outlined at"
+ echo "http://www.mysql.com/doc/R/e/Reporting_mysqltest_bugs.html"
+ echo "to find the reason to this problem and how to report this."
fi
}
diff --git a/mysql-test/r/func_test.result b/mysql-test/r/func_test.result
index 3dc0fc19848..5d2211baf50 100644
--- a/mysql-test/r/func_test.result
+++ b/mysql-test/r/func_test.result
@@ -34,3 +34,5 @@ this is a 2 2.0
1 1
1 and 0 or 2 2 or 1 and 0
1 1
+sum(if(num is null,0.00,num))
+144.54
diff --git a/mysql-test/t/func_test.test b/mysql-test/t/func_test.test
index 9562ae5f77b..0439a96f077 100644
--- a/mysql-test/t/func_test.test
+++ b/mysql-test/t/func_test.test
@@ -24,3 +24,13 @@ select -1.49 or -1.49,0.6 or 0.6;
select 5 between 0 and 10 between 0 and 1,(5 between 0 and 10) between 0 and 1;
select 1 and 2 between 2 and 10, 2 between 2 and 10 and 1;
select 1 and 0 or 2, 2 or 1 and 0;
+
+#
+# Problem with IF()
+#
+
+drop table if exists t1;
+create table t1 (num double(12,2));
+insert into t1 values (144.54);
+select sum(if(num is null,0.00,num)) from t1;
+drop table t1;