summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <evgen@moonbone.local>2005-11-01 17:34:19 +0300
committerunknown <evgen@moonbone.local>2005-11-01 17:34:19 +0300
commit03ed0d1d244de2e97c1ca5749f1677d1dbb07f95 (patch)
treee4fa11fd449f07a0ad374fccdf48f662aefd2cdc /mysql-test
parentfffe74170576439325ae7b59bf56e55bbeeee5c4 (diff)
parent6020281e9511f96cb99cf7d55643d75fa1a4a4a4 (diff)
downloadmariadb-git-03ed0d1d244de2e97c1ca5749f1677d1dbb07f95.tar.gz
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/14186-bug-4.1-mysql sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/update.result8
-rw-r--r--mysql-test/t/update.test9
2 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/r/update.result b/mysql-test/r/update.result
index 3408766d603..74c628f96c4 100644
--- a/mysql-test/r/update.result
+++ b/mysql-test/r/update.result
@@ -337,3 +337,11 @@ a b
22 3
23 3
drop table t1;
+create table t1 (f1 date not null);
+insert into t1 values('2000-01-01'),('0000-00-00');
+update t1 set f1='2002-02-02' where f1 is null;
+select * from t1;
+f1
+2000-01-01
+2002-02-02
+drop table t1;
diff --git a/mysql-test/t/update.test b/mysql-test/t/update.test
index e81415628d0..a21d10b6571 100644
--- a/mysql-test/t/update.test
+++ b/mysql-test/t/update.test
@@ -261,4 +261,13 @@ update t1 set a=a+12,b=3 order by a limit 3;
select * from t1 order by a;
drop table t1;
+
+#
+# Bug#14186 select datefield is null not updated
+#
+create table t1 (f1 date not null);
+insert into t1 values('2000-01-01'),('0000-00-00');
+update t1 set f1='2002-02-02' where f1 is null;
+select * from t1;
+drop table t1;
# End of 4.1 tests