diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-19 16:48:28 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-19 16:48:28 +0200 |
| commit | 8d70097c216081e8013a548bfbde156e48985816 (patch) | |
| tree | 4cca4f27d804ab261db2ee996f084fb5137833df /sql/handler.h | |
| parent | 079c3599711b9cbd3ce323f32cf99693cc3d5e3b (diff) | |
| parent | 252e690c859b53c51c7eecf072f33dbaaa01bcdf (diff) | |
| download | mariadb-git-8d70097c216081e8013a548bfbde156e48985816.tar.gz | |
Merge 10.1 to 10.2
Follow-up fix to MDEV-14008: Let Field_double::val_uint() silently
return 0 on error
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/handler.h b/sql/handler.h index 486ba564050..b280f6d597d 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1764,6 +1764,13 @@ struct HA_CREATE_INFO: public Table_scope_and_contents_source_st, used_fields|= (HA_CREATE_USED_CHARSET | HA_CREATE_USED_DEFAULT_CHARSET); return false; } + ulong table_options_with_row_type() + { + if (row_type == ROW_TYPE_DYNAMIC || row_type == ROW_TYPE_PAGE) + return table_options | HA_OPTION_PACK_RECORD; + else + return table_options; + } }; |