maria-developers team mailing list archive

[Sergei Golubchik <serg@xxxxxxxxxxx>]

Hi, Alexander,

Ok to push.
One minor comment below:

On Oct 25, Alexander Barkov wrote:
> revision-id: b2800c06b22 (mariadb-10.4.26-45-gb2800c06b22)
> parent(s): 34163154077
> author: Alexander Barkov
> committer: Alexander Barkov
> timestamp: 2022-10-25 11:53:39 +0400
> message:
> 
> MDEV-28545 MyISAM reorganize partition corrupt older table format
> diff --git a/sql/sql_table.cc b/sql/sql_table.cc
> index 6aae927800e..a621825c395 100644
> --- a/sql/sql_table.cc
> +++ b/sql/sql_table.cc
> @@ -10068,6 +10068,18 @@ do_continue:;
>  
>    set_table_default_charset(thd, create_info, alter_ctx.db);
>  
> +
> +#ifdef WITH_PARTITION_STORAGE_ENGINE
> +  if (!fast_alter_partition)
> +#endif

To avoid ifdef's you can use 

      if (IF_PARTITIONING(!fast_alter_partition, 1))

> +  {
> +    /*
> +      We cannot alter partitions and change column data types at the same
> +      time.
> +    */
> +    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))
> 
Regards,
Sergei
VP of MariaDB Server Engineering
and security@xxxxxxxxxxx