database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.10 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2023-06-27 17:45:06 +03:00
parent 774dee9abc 135e976696
commit 71a1a28a49
68 changed files with 1775 additions and 1066 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/handler.cc
View File

@ -4812,8 +4812,12 @@ static bool update_frm_version(TABLE *table)
by server with the same version. This also ensures that we do not
update frm version for temporary tables as this code doesn't support
temporary tables.
keep_original_mysql_version is set if the table version cannot be
changed without rewriting the frm file.
*/
if (table->s->mysql_version == MYSQL_VERSION_ID)
if (table->s->mysql_version == MYSQL_VERSION_ID ||
table->s->keep_original_mysql_version)
DBUG_RETURN(0);
strxmov(path, table->s->normalized_path.str, reg_ext, NullS);