Skip to content

Commit

Permalink
increase max field name
Browse files Browse the repository at this point in the history
Signed-off-by: Weijun-H <huangweijun1001@gmail.com>
  • Loading branch information
Weijun-H authored and FooBarrior committed Nov 26, 2022
1 parent da03d8d commit bbabdae
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 1 deletion.
9 changes: 9 additions & 0 deletions mysql-test/main/period_name.result
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#
# MDEV-29387: Period name with more than 32 symbols crashes the server
#
# test 34 symbols
create table t2 (s date, e date, period for `abcd123456789012345678901234567890` (s,e));
drop table t2;
# test 64 symbols
create table t2 (s date, e date, period for `abcd123456789012345678901234567890123456789012345678901234567890` (s,e));
drop table t2;
11 changes: 11 additions & 0 deletions mysql-test/main/period_name.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--echo #
--echo # MDEV-29387: Period name with more than 32 symbols crashes the server
--echo #

--echo # test 34 symbols
create table t2 (s date, e date, period for `abcd123456789012345678901234567890` (s,e));
drop table t2;

--echo # test 64 symbols
create table t2 (s date, e date, period for `abcd123456789012345678901234567890123456789012345678901234567890` (s,e));
drop table t2;
8 changes: 8 additions & 0 deletions mysql-test/suite/period/r/create.result
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,11 @@ show status like "Feature_application_time_periods";
Variable_name Value
Feature_application_time_periods 6
drop table t;
# MDEV-29387: Period name with more than 32 symbols crashes the server
#
# test 34 symbols
create table t2 (s date, e date, period for `abcd123456789012345678901234567890` (s,e));
drop table t2;
# test 64 symbols
create table t2 (s date, e date, period for `abcd123456789012345678901234567890123456789012345678901234567890` (s,e));
drop table t2;
11 changes: 11 additions & 0 deletions mysql-test/suite/period/t/create.test
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,14 @@ insert t values (2, '2001-01-01', '2001-01-01');
show status like "Feature_application_time_periods";

drop table t;

--echo # MDEV-29387: Period name with more than 32 symbols crashes the server
--echo #

--echo # test 34 symbols
create table t2 (s date, e date, period for `abcd123456789012345678901234567890` (s,e));
drop table t2;

--echo # test 64 symbols
create table t2 (s date, e date, period for `abcd123456789012345678901234567890123456789012345678901234567890` (s,e));
drop table t2;
2 changes: 1 addition & 1 deletion sql/sql_const.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
/* extra 4+4 bytes for slave tmp tables */
#define MAX_DBKEY_LENGTH (NAME_LEN*2+1+1+4+4)
#define MAX_ALIAS_NAME 256
#define MAX_FIELD_NAME 34 /* Max colum name length +2 */
#define MAX_FIELD_NAME (NAME_LEN+1) /* Max colum name length +2 */
#define MAX_SYS_VAR_LENGTH 32
#define MAX_KEY MAX_INDEXES /* Max used keys */
#define MAX_REF_PARTS 32 /* Max parts used as ref */
Expand Down

0 comments on commit bbabdae

Please sign in to comment.