Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
6786fb00
Commit
6786fb00
authored
Jan 16, 2019
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-15925 FRM_MAX_SIZE too low for some use cases
increase to 1M
parent
2061e00c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
mysql-test/r/huge_frm-6224.result
mysql-test/r/huge_frm-6224.result
+2
-0
mysql-test/t/huge_frm-6224.test
mysql-test/t/huge_frm-6224.test
+9
-2
sql/unireg.h
sql/unireg.h
+1
-1
No files found.
mysql-test/r/huge_frm-6224.result
View file @
6786fb00
set global max_allowed_packet=1024*1024*10;
ERROR HY000: The definition for table `t1` is too big
ERROR HY000: The definition for table `t1` is too big
set global max_allowed_packet=default;
mysql-test/t/huge_frm-6224.test
View file @
6786fb00
...
@@ -4,17 +4,24 @@
...
@@ -4,17 +4,24 @@
# verify that huge frms are rejected during creation, not on opening
# verify that huge frms are rejected during creation, not on opening
#
#
--
source
include
/
have_partition
.
inc
--
source
include
/
have_partition
.
inc
set
global
max_allowed_packet
=
1024
*
1024
*
10
;
connect
con1
,
localhost
,
root
;
let
$n
=
5646
;
let
$n
=
8164
;
let
$a
=
create
table
t1
(
a
int
)
engine
=
myisam
partition
by
hash
(
a
)
partitions
$n
(;
let
$a
=
create
table
t1
(
a
int
)
engine
=
myisam
partition
by
hash
(
a
)
partitions
$n
(;
dec
$n
;
dec
$n
;
while
(
$n
)
while
(
$n
)
{
{
let
$a
=
$a
partition
p01234567890123456789012345678901234567890123456789012345678
$n
,;
let
$a
=
$a
partition
p01234567890123456789012345678901234567890123456789012345678
$n
COMMENT
'partition p01234567890123456789012345678901234567890123456789012345678$n'
,;
dec
$n
;
dec
$n
;
}
}
--
disable_query_log
--
disable_query_log
--
error
ER_TABLE_DEFINITION_TOO_BIG
--
error
ER_TABLE_DEFINITION_TOO_BIG
eval
$a
partition
foo
);
eval
$a
partition
foo
);
--
enable_query_log
connection
default
;
disconnect
con1
;
set
global
max_allowed_packet
=
default
;
sql/unireg.h
View file @
6786fb00
...
@@ -202,7 +202,7 @@ LEX_CUSTRING build_frm_image(THD *thd, const char *table,
...
@@ -202,7 +202,7 @@ LEX_CUSTRING build_frm_image(THD *thd, const char *table,
#define FRM_HEADER_SIZE 64
#define FRM_HEADER_SIZE 64
#define FRM_FORMINFO_SIZE 288
#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
)
static
inline
bool
is_binary_frm_header
(
uchar
*
head
)
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment