summaryrefslogtreecommitdiff
path: root/sql/unireg.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-01-24 16:14:12 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-01-24 16:14:12 +0200
commit947b6b849d907dc0793f076aec7e553869db744f (patch)
tree50e7d87866ed50b8510336ce33d515ed32386754 /sql/unireg.h
parent55be043c13d45581a0cecbae85d1f7de2708d891 (diff)
parentfab531a150ec588f87e8a636d2ba1ecbfffdb08e (diff)
downloadmariadb-git-947b6b849d907dc0793f076aec7e553869db744f.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql/unireg.h')
-rw-r--r--sql/unireg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/unireg.h b/sql/unireg.h
index 88d0c882824..8d07e5940a3 100644
--- a/sql/unireg.h
+++ b/sql/unireg.h
@@ -198,7 +198,7 @@ LEX_CUSTRING build_frm_image(THD *thd, const LEX_CSTRING *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)
{