summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorThirunarayanan Balathandayuthapani <thiru@mariadb.com>2018-06-25 18:16:29 +0530
committerThirunarayanan Balathandayuthapani <thiru@mariadb.com>2018-06-25 18:16:29 +0530
commit69b9ed063b78d2bf28ec0a4823e0b0317fce2c4d (patch)
tree394b17edf92b1c740e5de3aa31e698e4723e9420 /mysql-test
parent46fc864b90228e007e13fbd166674309d51bf955 (diff)
downloadmariadb-git-69b9ed063b78d2bf28ec0a4823e0b0317fce2c4d.tar.gz
MDEV-16365 Setting a column NOT NULL fails to return error for
NULL values when there is no DEFAULT - Post push fix for adding n_rows in row_log_t.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/innodb/r/alter_non_null_debug,STRICT.rdiff4
-rw-r--r--mysql-test/suite/innodb/r/alter_non_null_debug.result2
2 files changed, 1 insertions, 5 deletions
diff --git a/mysql-test/suite/innodb/r/alter_non_null_debug,STRICT.rdiff b/mysql-test/suite/innodb/r/alter_non_null_debug,STRICT.rdiff
index 2865c5d7f71..09c717c44b0 100644
--- a/mysql-test/suite/innodb/r/alter_non_null_debug,STRICT.rdiff
+++ b/mysql-test/suite/innodb/r/alter_non_null_debug,STRICT.rdiff
@@ -9,7 +9,3 @@
< 2 0
---
> 2 NULL
-71c68
-< Warning 1265 Data truncated for column 'c2' at row 7
----
-> Warning 1265 Data truncated for column 'c2' at row 6
diff --git a/mysql-test/suite/innodb/r/alter_non_null_debug.result b/mysql-test/suite/innodb/r/alter_non_null_debug.result
index e4c42241f5d..c12f1fbca3d 100644
--- a/mysql-test/suite/innodb/r/alter_non_null_debug.result
+++ b/mysql-test/suite/innodb/r/alter_non_null_debug.result
@@ -68,7 +68,7 @@ connection default;
affected rows: 0
info: Records: 0 Duplicates: 0 Warnings: 1
Warnings:
-Warning 1265 Data truncated for column 'c2' at row 7
+Warning 1265 Data truncated for column 'c2' at row 3
SELECT * FROM t1;
c1 c2 c3
1 2 3