Merge branch '10.3' into bb-10.3-merge

Author: sanja-byelkin

.gitignore

@@ -128,6 +128,8 @@ scripts/wsrep_sst_mysqldump
 scripts/wsrep_sst_rsync
 scripts/wsrep_sst_rsync_wan
 scripts/wsrep_sst_mariabackup
+scripts/wsrep_sst_xtrabackup
+scripts/wsrep_sst_xtrabackup-v2
 scripts/maria_add_gis_sp.sql
 scripts/maria_add_gis_sp_bootstrap.sql
 scripts/galera_new_cluster

BUILD/SETUP.sh

@@ -122,7 +122,8 @@ get_make_parallel_flag
 # SSL library to use.--with-ssl will select our bundled yaSSL
 # implementation of SSL. --with-ssl=yes will first try system library
 # then the boundled one --with-ssl=system will use the system library.
-SSL_LIBRARY=--with-ssl=system
+# We use bundled by default as this is guaranteed to work with Galera
+SSL_LIBRARY=--with-ssl
 
 if [ "x$warning_mode" = "xpedantic" ]; then
  warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE"
@@ -194,6 +195,8 @@ base_configs="$base_configs --with-extra-charsets=complex "
 base_configs="$base_configs --enable-thread-safe-client "
 base_configs="$base_configs --with-big-tables $maintainer_mode"
 base_configs="$base_configs --with-plugin-aria --with-aria-tmp-tables"
+# Following is to get tokudb to work
+base_configs="$base_configs --with-jemalloc=NO"
 
 if test -d "$path/../cmd-line-utils/readline"
 then

cmake/configure.pl

@@ -145,6 +145,11 @@ sub check_compiler
  $cmakeargs = $cmakeargs." -DPLUGIN_".uc($1)."=".uc($2);
  next;
  }
+ if($option =~ /without-wsrep/)
+ {
+ $cmakeargs = $cmakeargs." -DWITH_WSREP=OFF";
+ next;
+ }
  if($option =~ /with-zlib-dir=bundled/)
  {
  $cmakeargs = $cmakeargs." -DWITH_ZLIB=bundled";
@@ -185,6 +190,16 @@ sub check_compiler
  $cmakeargs = $cmakeargs." -DCMAKE_BUILD_TYPE=Debug -DSECURITY_HARDENED=OFF";
  next;
  }
+ if($option =~ /with-(.*)=(.*)/)
+ {
+ $cmakeargs = $cmakeargs. " -DWITH_" . uc($1) . "=" . uc($2);
+ next;
+ }
+ if($option =~ /without-(.*)=(.*)/)
+ {
+ $cmakeargs = $cmakeargs. " -DWITHOUT_" . uc($1) . "=" . uc($2);
+ next;
+ }
  if($option =~ /prefix=/)
  {
  $cmake_install_prefix= substr($option, 7);

mysql-test/suite/innodb/r/instant_alter_import.result

@@ -0,0 +1,46 @@
+set default_storage_engine=innodb;
+#
+# MDEV-18295 IMPORT TABLESPACE fails with instant-altered tables
+#
+create table t2 (x int, z int default 41);
+alter table t2 discard tablespace;
+create table t1 (x int);
+insert into t1 values (1);
+alter table t1 add z int default 42, algorithm instant;
+select * from t1;
+x	z
+1	42
+flush tables t1 for export;
+unlock tables;
+# The metadata has to be updated to instant ADD COLUMN.
+alter table t2 import tablespace;
+select * from t2;
+x	z
+1	42
+insert into t2 set x=2;
+select * from t2;
+x	z
+1	42
+2	41
+alter table t1 discard tablespace;
+flush tables t2 for export;
+unlock tables;
+# Both the metadata and the data file used instant ADD COLUMN.
+alter table t1 import tablespace;
+select * from t1;
+x	z
+1	42
+2	41
+drop table t2;
+create table t2 select * from t1;
+alter table t1 discard tablespace;
+flush tables t2 for export;
+unlock tables;
+# The instant ADD COLUMN has to be removed from the metadata.
+alter table t1 import tablespace;
+select * from t1;
+x	z
+1	42
+2	41
+drop table t2;
+drop table t1;

mysql-test/suite/innodb/t/instant_alter_import.test

@@ -0,0 +1,52 @@
+--source include/have_innodb.inc
+set default_storage_engine=innodb;
+
+--echo #
+--echo # MDEV-18295 IMPORT TABLESPACE fails with instant-altered tables
+--echo #
+
+create table t2 (x int, z int default 41);
+alter table t2 discard tablespace;
+
+create table t1 (x int);
+insert into t1 values (1);
+alter table t1 add z int default 42, algorithm instant;
+select * from t1;
+flush tables t1 for export;
+--let $MYSQLD_DATADIR= `select @@datadir`
+--move_file $MYSQLD_DATADIR/test/t1.cfg $MYSQLD_DATADIR/test/t2.cfg
+--copy_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLD_DATADIR/test/t2.ibd
+unlock tables;
+
+--echo # The metadata has to be updated to instant ADD COLUMN.
+alter table t2 import tablespace;
+
+select * from t2;
+insert into t2 set x=2;
+select * from t2;
+
+alter table t1 discard tablespace;
+flush tables t2 for export;
+--move_file $MYSQLD_DATADIR/test/t2.cfg $MYSQLD_DATADIR/test/t1.cfg
+--copy_file $MYSQLD_DATADIR/test/t2.ibd $MYSQLD_DATADIR/test/t1.ibd
+unlock tables;
+
+--echo # Both the metadata and the data file used instant ADD COLUMN.
+alter table t1 import tablespace;
+select * from t1;
+
+drop table t2;
+create table t2 select * from t1;
+
+alter table t1 discard tablespace;
+flush tables t2 for export;
+--move_file $MYSQLD_DATADIR/test/t2.cfg $MYSQLD_DATADIR/test/t1.cfg
+--copy_file $MYSQLD_DATADIR/test/t2.ibd $MYSQLD_DATADIR/test/t1.ibd
+unlock tables;
+
+--echo # The instant ADD COLUMN has to be removed from the metadata.
+alter table t1 import tablespace;
+select * from t1;
+
+drop table t2;
+drop table t1;

mysys/my_fopen.c

@@ -171,10 +171,7 @@ int my_fclose(FILE *fd, myf MyFlags)
  my_file_info[file].type= UNOPEN;
  }
 #ifndef _WIN32
- do
- {
- err= fclose(fd);
- } while (err == -1 && errno == EINTR);
+ err= fclose(fd);
 #else
  err= my_win_fclose(fd);
 #endif

plugin/user_variables/mysql-test/user_variables/basic.result

@@ -7,7 +7,7 @@ PLUGIN_AUTHOR	Sergey Vojtovich
 PLUGIN_DESCRIPTION	User-defined variables
 PLUGIN_LICENSE	GPL
 LOAD_OPTION	ON
-PLUGIN_MATURITYGamma
+PLUGIN_MATURITYStable
 SHOW CREATE TABLE INFORMATION_SCHEMA.USER_VARIABLES;
 Table	Create Table
 user_variables	CREATE TEMPORARY TABLE `user_variables` (

plugin/user_variables/user_variables.cc

@@ -135,6 +135,6 @@ maria_declare_plugin(user_variables)
  NULL,
  NULL,
  "1.0",
- MariaDB_PLUGIN_MATURITY_GAMMA
+ MariaDB_PLUGIN_MATURITY_STABLE
 }
 maria_declare_plugin_end;

sql/ha_sequence.cc

@@ -443,6 +443,6 @@ maria_declare_plugin(sql_sequence)
  NULL, /* status variables */
  NULL, /* system variables */
  "1.0", /* string version */
- MariaDB_PLUGIN_MATURITY_ALPHA /* maturity */
+ MariaDB_PLUGIN_MATURITY_STABLE /* maturity */
 }
 maria_declare_plugin_end;

storage/innobase/handler/ha_innodb.cc

@@ -4,7 +4,7 @@ Copyright (c) 2000, 2018, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2008, 2009 Google Inc.
 Copyright (c) 2009, Percona Inc.
 Copyright (c) 2012, Facebook Inc.
-Copyright (c) 2013, 2018, MariaDB Corporation.
+Copyright (c) 2013, 2019, MariaDB Corporation.
 
 Portions of this file contain modifications contributed and copyrighted by
 Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -12700,22 +12700,19 @@ ha_innobase::discard_or_import_tablespace(
 DBUG_RETURN(HA_ERR_TABLE_READONLY);
 }
 
-dict_table_t*	dict_table = m_prebuilt->table;
-
-if (dict_table->is_temporary()) {
-
+if (m_prebuilt->table->is_temporary()) {
 ib_senderrf(
 m_prebuilt->trx->mysql_thd, IB_LOG_LEVEL_ERROR,
 ER_CANNOT_DISCARD_TEMPORARY_TABLE);
 
 DBUG_RETURN(HA_ERR_TABLE_NEEDS_UPGRADE);
 }
 
-if (dict_table->space == fil_system.sys_space) {
+if (m_prebuilt->table->space == fil_system.sys_space) {
 ib_senderrf(
 m_prebuilt->trx->mysql_thd, IB_LOG_LEVEL_ERROR,
 ER_TABLE_IN_SYSTEM_TABLESPACE,
-dict_table->name.m_name);
+m_prebuilt->table->name.m_name);
 
 DBUG_RETURN(HA_ERR_TABLE_NEEDS_UPGRADE);
 }
@@ -12724,7 +12721,7 @@ ha_innobase::discard_or_import_tablespace(
 
 /* Obtain an exclusive lock on the table. */
 dberr_t	err = row_mysql_lock_table(
-m_prebuilt->trx, dict_table, LOCK_X,
+m_prebuilt->trx, m_prebuilt->table, LOCK_X,
 discard ? "setting table lock for DISCARD TABLESPACE"
 : "setting table lock for IMPORT TABLESPACE");
 
@@ -12737,32 +12734,32 @@ ha_innobase::discard_or_import_tablespace(
 user may want to set the DISCARD flag in order to IMPORT
 a new tablespace. */
 
-if (!dict_table->is_readable()) {
+if (!m_prebuilt->table->is_readable()) {
 ib_senderrf(
 m_prebuilt->trx->mysql_thd,
 IB_LOG_LEVEL_WARN, ER_TABLESPACE_MISSING,
-dict_table->name.m_name);
+m_prebuilt->table->name.m_name);
 }
 
 err = row_discard_tablespace_for_mysql(
-dict_table->name.m_name, m_prebuilt->trx);
+m_prebuilt->table->name.m_name, m_prebuilt->trx);
 
-} else if (dict_table->is_readable()) {
+} else if (m_prebuilt->table->is_readable()) {
 /* Commit the transaction in order to
 release the table lock. */
 trx_commit_for_mysql(m_prebuilt->trx);
 
 ib::error() << "Unable to import tablespace "
-<< dict_table->name << " because it already"
+<< m_prebuilt->table->name << " because it already"
 " exists. Please DISCARD the tablespace"
 " before IMPORT.";
 ib_senderrf(
 m_prebuilt->trx->mysql_thd, IB_LOG_LEVEL_ERROR,
-ER_TABLESPACE_EXISTS, dict_table->name.m_name);
+ER_TABLESPACE_EXISTS, m_prebuilt->table->name.m_name);
 
 DBUG_RETURN(HA_ERR_TABLE_EXIST);
 } else {
-err = row_import_for_mysql(dict_table, m_prebuilt);
+err = row_import_for_mysql(m_prebuilt->table, m_prebuilt);
 
 if (err == DB_SUCCESS) {
 
@@ -12778,12 +12775,35 @@ ha_innobase::discard_or_import_tablespace(
 /* Commit the transaction in order to release the table lock. */
 trx_commit_for_mysql(m_prebuilt->trx);
 
-if (err == DB_SUCCESS && !discard
- && dict_stats_is_persistent_enabled(dict_table)) {
+if (discard || err != DB_SUCCESS) {
+DBUG_RETURN(convert_error_code_to_mysql(
+ err, m_prebuilt->table->flags, NULL));
+}
+
+/* Evict and reload the table definition in order to invoke
+btr_cur_instant_init(). */
+table_id_t id = m_prebuilt->table->id;
+ut_ad(id);
+mutex_enter(&dict_sys->mutex);
+dict_table_close(m_prebuilt->table, TRUE, FALSE);
+dict_table_remove_from_cache(m_prebuilt->table);
+m_prebuilt->table = dict_table_open_on_id(id, TRUE,
+ DICT_TABLE_OP_NORMAL);
+mutex_exit(&dict_sys->mutex);
+if (!m_prebuilt->table) {
+err = DB_TABLE_NOT_FOUND;
+} else {
+if (const Field* ai = table->found_next_number_field) {
+initialize_auto_increment(m_prebuilt->table, ai);
+}
+dict_stats_init(m_prebuilt->table);
+}
+
+if (dict_stats_is_persistent_enabled(m_prebuilt->table)) {
 dberr_t	ret;
 
 /* Adjust the persistent statistics. */
-ret = dict_stats_update(dict_table,
+ret = dict_stats_update(m_prebuilt->table,
 DICT_STATS_RECALC_PERSISTENT);
 
 if (ret != DB_SUCCESS) {
@@ -12793,11 +12813,12 @@ ha_innobase::discard_or_import_tablespace(
 ER_ALTER_INFO,
 "Error updating stats for table '%s'"
 " after table rebuild: %s",
-dict_table->name.m_name, ut_strerr(ret));
+m_prebuilt->table->name.m_name,
+ut_strerr(ret));
 }
 }
 
-DBUG_RETURN(convert_error_code_to_mysql(err, dict_table->flags, NULL));
+DBUG_RETURN(0);
 }
 
 /**