diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-23 14:34:23 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-23 14:34:23 +0200 |
commit | 3b6d2efcb1d5be93574b3b345e3dbfc8fc9387e1 (patch) | |
tree | 0f28104bebbe56d1b93b8a02c5a032c07d910f7c /sql/unireg.h | |
parent | 52d13036d81fdaa277c9894784dfefd85cf41287 (diff) | |
parent | 2a0f1d613219ad7962c3394b9c1996ece40926df (diff) | |
download | mariadb-git-3b6d2efcb1d5be93574b3b345e3dbfc8fc9387e1.tar.gz |
Merge 10.0 into 10.1
Diffstat (limited to 'sql/unireg.h')
-rw-r--r-- | sql/unireg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index e1947d8d3cd..86d88fcdc21 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -203,7 +203,7 @@ LEX_CUSTRING build_frm_image(THD *thd, const char *table, #define FRM_HEADER_SIZE 64 #define FRM_FORMINFO_SIZE 288 -#define FRM_MAX_SIZE (512*1024) +#define FRM_MAX_SIZE (1024*1024) static inline bool is_binary_frm_header(uchar *head) { |