summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps_4heap.result
diff options
context:
space:
mode:
authorgshchepa/uchum@host.loc <>2008-01-11 05:06:08 +0400
committergshchepa/uchum@host.loc <>2008-01-11 05:06:08 +0400
commit32d13ab23d18c07b361df79f24961288243c14ec (patch)
treed8feee23dcee7d250b78786ec8170e5e615d4e65 /mysql-test/r/ps_4heap.result
parent5b9e61b282a624945dd2631f58d1949b6645dc51 (diff)
downloadmariadb-git-32d13ab23d18c07b361df79f24961288243c14ec.tar.gz
Bug#33699: The UPDATE statement allows NULL as new value on a NOT NULL
columns (default datatype value is assigned). The mysql_update function has been modified to generate an error when trying to set a NOT NULL field to NULL rather than a warning in the set_field_to_null_with_conversions function.
Diffstat (limited to 'mysql-test/r/ps_4heap.result')
-rw-r--r--mysql-test/r/ps_4heap.result5
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result
index 862c0ff75c1..0c643facf72 100644
--- a/mysql-test/r/ps_4heap.result
+++ b/mysql-test/r/ps_4heap.result
@@ -1287,12 +1287,11 @@ a b
set @arg00=NULL;
set @arg01=2;
execute stmt1 using @arg00, @arg01;
-Warnings:
-Warning 1048 Column 'a' cannot be null
+ERROR 23000: Column 'a' cannot be null
select a,b from t1 order by a;
a b
-0 two
1 one
+2 two
3 three
4 four
set @arg00=0;