diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-08-30 12:17:33 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-08-30 12:17:33 +0300 |
| commit | 7e574eb52c328f2abc2d5737051d522ba488ad3d (patch) | |
| tree | 2fafd668294354a87c381f0f2aab5f06a0cef96e /sql/table.cc | |
| parent | 827b049e1e7df204feb744a270b4dca619a61de1 (diff) | |
| parent | 57739ae94a4af580c62bbc87d364fa002c5dbe04 (diff) | |
| download | mariadb-git-7e574eb52c328f2abc2d5737051d522ba488ad3d.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 1a30809cde9..37a23d5b93e 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -4659,7 +4659,8 @@ void update_create_info_from_table(HA_CREATE_INFO *create_info, TABLE *table) int rename_file_ext(const char * from,const char * to,const char * ext) { - char from_b[FN_REFLEN],to_b[FN_REFLEN]; + /* Reserve space for ./databasename/tablename.frm + NUL byte */ + char from_b[2 + FN_REFLEN + 4 + 1], to_b[2 + FN_REFLEN + 4 + 1]; (void) strxmov(from_b,from,ext,NullS); (void) strxmov(to_b,to,ext,NullS); return mysql_file_rename(key_file_frm, from_b, to_b, MYF(0)); |