diff options
| author | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2018-04-24 13:15:35 +0530 |
|---|---|---|
| committer | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2018-04-24 13:15:35 +0530 |
| commit | 4f9977d8d3292caf509227154dafc416a178d17d (patch) | |
| tree | b2680df661d8541c090a4455a249b738eba161d6 /storage/innobase/include/row0log.h | |
| parent | 461de7edeaef80693e38969a4d7d3f5ae9bb5e63 (diff) | |
| download | mariadb-git-4f9977d8d3292caf509227154dafc416a178d17d.tar.gz | |
MDEV-14168 Unconditionally allow ALGORITHM=INPLACE for setting a column NOT NULL
- Allow NOT NULL constraint to replace the NULL value in the row with
explicit or implicit default value.
- If the default value is non-const value then inplace alter won't
support it.
- ALTER IGNORE will ignore the error if the concurrent DML contains
NULL value.
Diffstat (limited to 'storage/innobase/include/row0log.h')
| -rw-r--r-- | storage/innobase/include/row0log.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/innobase/include/row0log.h b/storage/innobase/include/row0log.h index df9920d9bcc..6974ce1b56b 100644 --- a/storage/innobase/include/row0log.h +++ b/storage/innobase/include/row0log.h @@ -55,12 +55,13 @@ row_log_allocate( or NULL when creating a secondary index */ bool same_pk,/*!< in: whether the definition of the PRIMARY KEY has remained the same */ - const dtuple_t* add_cols, + const dtuple_t* defaults, /*!< in: default values of - added columns, or NULL */ + added, changed columns, or NULL */ const ulint* col_map,/*!< in: mapping of old column numbers to new ones, or NULL if !table */ - const char* path) /*!< in: where to create temporary file */ + const char* path, /*!< in: where to create temporary file */ + bool ignore) /*!< in: Whether alter ignore issued */ MY_ATTRIBUTE((nonnull(1), warn_unused_result)); /******************************************************//** |