diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-10-11 18:13:44 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-10-11 18:13:44 +0400 |
| commit | 3062445a64ff50c7a29493356a3454777d4dd595 (patch) | |
| tree | 79d554031bbb1455e744dc7f3b4db853aaba5ebf /sql/field.h | |
| parent | f9066dc347499ea2fd25f21def4b377a7037760a (diff) | |
| download | mariadb-git-3062445a64ff50c7a29493356a3454777d4dd595.tar.gz | |
MDEV-14038 ALTER TABLE does not exit on error with InnoDB + bad default function
Changing Field::set_default from void to int.
It now uses the same return value notation with Field::store*()
and Item::save_in_field().
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.h b/sql/field.h index 91e97c8dce7..1d0ce8c74cf 100644 --- a/sql/field.h +++ b/sql/field.h @@ -953,7 +953,7 @@ public: my_ptrdiff_t l_offset= (my_ptrdiff_t) (record - table->record[0]); return ptr + l_offset; } - virtual void set_default(); + virtual int set_default(); bool has_update_default_function() const { @@ -3715,7 +3715,7 @@ public: virtual uchar *pack(uchar *to, const uchar *from, uint max_length); virtual const uchar *unpack(uchar *to, const uchar *from, const uchar *from_end, uint param_data); - virtual void set_default(); + virtual int set_default(); Field *new_key_field(MEM_ROOT *root, TABLE *new_table, uchar *new_ptr, uint32 length, |