database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.6' into 10.7

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-11-02 19:47:23 +01:00
parent 6449af6f2d b798944a93
commit 2e2173a359
89 changed files with 4155 additions and 1064 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_table.cc
View File

@ -10083,6 +10083,18 @@ do_continue:;
set_table_default_charset(thd, create_info, alter_ctx.db);
/*
The ALTER related code cannot alter partitions and change column data types
at the same time. So in case of partition change statements like:
ALTER TABLE t1 DROP PARTITION p1;
we skip implicit data type upgrade (such as "MariaDB 5.3 TIME" to
"MySQL 5.6 TIME" or vice versa according to mysql56_temporal_format).
Note, one can run a separate "ALTER TABLE t1 FORCE;" statement
before or after the partition change ALTER statement to upgrade data types.
*/
if (IF_PARTITIONING(!fast_alter_partition, 1))
Create_field::upgrade_data_types(alter_info->create_list);
if (create_info->check_fields(thd, alter_info,
table_list->table_name, table_list->db) ||
create_info->fix_period_fields(thd, alter_info))