diff options
| author | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2018-06-25 14:52:38 +0530 |
|---|---|---|
| committer | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2018-06-25 14:52:38 +0530 |
| commit | 88aaf590ac9fa8c8030a5831cebd867a7f35478f (patch) | |
| tree | 98292a41dce622c8f7de750c067ac87ea6613e98 /sql/field.h | |
| parent | 1abd877e2df9e83bc1c2f5195796f427a35bd3f1 (diff) | |
| download | mariadb-git-88aaf590ac9fa8c8030a5831cebd867a7f35478f.tar.gz | |
MDEV-16365 Setting a column NOT NULL fails to return error for
NULL values when there is no DEFAULT
Copy and inplace algorithm works similarly for
NULL to NOT NULL conversion for the following cases:
(1) strict sql mode - Should give error.
(2) non-strict sql mode - Should give warnings alone
(3) alter ignore table command. - Should give warnings alone.
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index 69e53087478..7db9dfbdaa2 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1368,7 +1368,7 @@ public: virtual uint repertoire(void) const { return MY_REPERTOIRE_UNICODE30; } virtual int set_time() { return 1; } bool set_warning(Sql_condition::enum_warning_level, unsigned int code, - int cuted_increment) const; + int cuted_increment, ulong current_row=0) const; protected: bool set_warning(unsigned int code, int cuted_increment) const { |