maria-developers team mailing list archive

[Marko Mäkelä <marko.makela@xxxxxxxxxxx>]

Hi Sanja,

The patch is adding many changes from MySQL for things that we have
already fixed in a better way in both InnoDB and XtraDB when merging
from MySQL 5.6.42.
Most of it should not be applied.

I checked the following output:
cd percona-server
git diff Percona-Server-5.6.41-84.1..Percona-Server-5.6.42-84.2
storage/innobase/|
diff -I^@@ - <(cd ../mysql-server;git diff mysql-5.6.41..mysql-5.6.42
storage/innobase/)

It identified the following files that have useful changes from Percona:
storage/xtradb/include/univ.i
storage/xtradb/log/log0online.cc
storage/xtradb/row/row0mysql.cc

Let me identify the acceptable changes below. Please do not apply
anything else to storage/xtradb.

>  storage/xtradb/handler/ha_innodb.cc     |  5 ++++
>  storage/xtradb/handler/handler0alter.cc | 35 ++++++++++++++++++++++------
>  storage/xtradb/include/os0file.h        |  6 ++++-
>  storage/xtradb/row/row0merge.cc         | 17 ++++++++++++--
>  storage/xtradb/row/row0sel.cc           |  4 ++--

Please, no changes to these files.

>  storage/xtradb/include/univ.i           |  2 +-
>  storage/xtradb/log/log0online.cc        | 41 ++++++++++++++++++++++++++++++++-

These are OK as such.

>  storage/xtradb/row/row0mysql.cc         | 15 +++---------
This contains too many changes. Let me quote the only acceptable change:

> diff --git a/storage/xtradb/row/row0mysql.cc b/storage/xtradb/row/row0mysql.cc
> index ddde8b8f730..9fc5c669ba0 100644
> --- a/storage/xtradb/row/row0mysql.cc
> +++ b/storage/xtradb/row/row0mysql.cc
> @@ -5500,18 +5500,6 @@ row_rename_table_for_mysql(
>                 goto funct_exit;
>         }
>
> -       /* Wait for background fts sync to finish */
> -       for (retry = 1; dict_fts_index_syncing(table); ++retry) {
> -               DICT_BG_YIELD(trx);
> -               if (retry % 100 == 0) {
> -                       ib_logf(IB_LOG_LEVEL_INFO,
> -                               "Unable to rename table %s to new name"
> -                               " %s because FTS sync is running on table."
> -                               " Retrying\n",
> -                               old_name, new_name);
> -               }
> -       }
> -
>         /* We use the private SQL parser of Innobase to generate the query
>         graphs needed in updating the dictionary data from system tables. */
>

The above is http://github.com/percona/percona-server/commit/a7f9ecef3ed61468eb5a37af4f18c49f54d74048
which is removing a Percona workaround for a MySQL bug that was fixed
both in MySQL 5.6.42 and in MariaDB.

Best regards,

Marko