Merge 10.2 into bb-10.2-ext

Author: dr-m

extra/mariabackup/xtrabackup.cc

@@ -5070,7 +5070,7 @@ handle_options(int argc, char **argv, char ***argv_client, char ***argv_server)
 setup_error_messages();
 sys_var_init();
 plugin_mutex_init();
-mysql_rwlock_init(key_rwlock_LOCK_system_variables_hash, &LOCK_system_variables_hash);
+mysql_prlock_init(key_rwlock_LOCK_system_variables_hash, &LOCK_system_variables_hash);
 opt_stack_trace = 1;
 test_flags |= TEST_SIGINT;
 init_signals();

mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result

@@ -1,6 +1,9 @@
+connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
 #Connection 2
+connection node_2;
 START SLAVE;
 #Connection 1
+connection node_1;
 CREATE TABLE t2 (f1 INTEGER PRIMARY KEY, f2 int unique) ENGINE=InnoDB;
 INSERT INTO t2 VALUES(1,11);
 INSERT INTO t2 VALUES(2,22);
@@ -10,6 +13,7 @@ SELECT @@global.gtid_binlog_state;
 1-1-4
 include/save_master_gtid.inc
 #Connection 2
+connection node_2;
 include/sync_with_master_gtid.inc
 SELECT @@global.gtid_binlog_state;
 @@global.gtid_binlog_state
@@ -21,12 +25,14 @@ SELECT @@global.gtid_binlog_state;
 @@global.gtid_binlog_state
 1-1-4,2-2-3
 #Connection 3
+connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
 INSERT INTO t2 VALUES(7,77);
 INSERT INTO t2 VALUES(8,88);
 SELECT @@global.gtid_binlog_state;
 @@global.gtid_binlog_state
 1-1-4,2-2-3,2-3-5
 #Connection 1
+connection node_1;
 CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB;
 SET AUTOCOMMIT=OFF;
 START TRANSACTION;
@@ -35,28 +41,35 @@ INSERT INTO t1 VALUES ('node1_committed_before');
 COMMIT;
 include/save_master_gtid.inc
 #Connection 2
+connection node_2;
 include/sync_with_master_gtid.inc
 SET AUTOCOMMIT=OFF;
 START TRANSACTION;
 INSERT INTO t1 VALUES ('node2_committed_before');
 INSERT INTO t1 VALUES ('node2_committed_before');
 COMMIT;
 #Connection 3
+connection node_3;
+connection node_2;
+connection node_3;
 Shutting down server ...
 #Connection 2
+connection node_2;
 SET AUTOCOMMIT=OFF;
 START TRANSACTION;
 INSERT INTO t1 VALUES ('node1_committed_during');
 INSERT INTO t1 VALUES ('node1_committed_during');
 COMMIT;
 #Connection 3
+connection node_3;
 Starting server ...
 SET AUTOCOMMIT=OFF;
 START TRANSACTION;
 INSERT INTO t1 VALUES ('node3_committed_after');
 INSERT INTO t1 VALUES ('node3_committed_after');
 COMMIT;
 #Connection 2
+connection node_2;
 Select * from t1 order by f1;
 f1
 node1_committed_before
@@ -68,6 +81,7 @@ node2_committed_before
 node3_committed_after
 node3_committed_after
 #Connection 3
+connection node_3;
 Select * from t1 order by f1;
 f1
 node1_committed_before
@@ -79,26 +93,34 @@ node2_committed_before
 node3_committed_after
 node3_committed_after
 #Connection 2
+connection node_2;
 SELECT @@global.gtid_binlog_state;
 @@global.gtid_binlog_state
 1-1-6,2-2-7,2-3-8
 #Connection 3
+connection node_3;
 SELECT @@global.gtid_binlog_state;
 @@global.gtid_binlog_state
 1-1-6,2-2-7,2-3-8
 #Connection 1
+connection node_1;
 SET AUTOCOMMIT=ON;
 #Connection 2
+connection node_2;
 SET AUTOCOMMIT=ON;
 #Connection 3
+connection node_3;
 SET AUTOCOMMIT=ON;
 #Connection 2
+connection node_2;
 STOP slave;
 INSERT INTO t1 VALUES ('node2_slave_stoped');
 #Connection 1
+connection node_1;
 INSERT INTO t1 VALUES ('node1_normal_entry');
 include/save_master_gtid.inc
 #Connection 2
+connection node_2;
 INSERT INTO t1 VALUES ('node2_slave_stoped_inserted');
 start slave;
 include/sync_with_master_gtid.inc
@@ -110,21 +132,28 @@ SELECT @@global.gtid_binlog_state;
 @@global.gtid_binlog_state
 1-1-7,2-3-8,2-2-11
 #Connection 3
+connection node_3;
 SELECT count(*) from t1;
 count(*)
 12
 SELECT @@global.gtid_binlog_state;
 @@global.gtid_binlog_state
 1-1-7,2-3-8,2-2-11
 #Connection 1
+connection node_1;
 DROP TABLE t2,t1;
 #Connection 2
+connection node_2;
 #Connection 3
+connection node_3;
 #Connection 2
+connection node_2;
 STOP SLAVE;
 RESET SLAVE ALL;
 reset master;
 #Connection 3
+connection node_3;
 reset master;
 #Connection 1
+connection node_1;
 reset master;

mysql-test/suite/galera/r/galera_parallel_autoinc_largetrx.result

@@ -22,7 +22,7 @@ COUNT(DISTINCT f1)
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE
 USER = 'system user' AND STATE NOT LIKE 'InnoDB%';
 COUNT(*)
-5
+3
 connection default;
 DROP TABLE t1;
 DROP TABLE ten;

mysql-test/suite/innodb_gis/r/rtree_debug.result

@@ -38,14 +38,11 @@ t1	CREATE TABLE `t1` (
  `c2` geometry NOT NULL,
  SPATIAL KEY `idx` (`c2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-SET DEBUG='+d,row_merge_ins_spatial_fail';
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
+SET @save_dbug = @@SESSION.debug_dbug;
+SET debug_dbug='+d,row_merge_ins_spatial_fail';
 create spatial index idx2 on t1(c2);
 ERROR HY000: Got error 1000 "Unknown error 1000" from storage engine InnoDB
-SET DEBUG='-d,row_merge_ins_spatial_fail';
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
+SET debug_dbug = @save_dbug;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

mysql-test/suite/innodb_gis/t/rtree_debug.test

@@ -49,10 +49,11 @@ create spatial index idx on t1(c2);
 
 show create table t1;
 
-SET DEBUG='+d,row_merge_ins_spatial_fail';
+SET @save_dbug = @@SESSION.debug_dbug;
+SET debug_dbug='+d,row_merge_ins_spatial_fail';
 --error ER_GET_ERRNO
 create spatial index idx2 on t1(c2);
-SET DEBUG='-d,row_merge_ins_spatial_fail';
+SET debug_dbug = @save_dbug;
 show create table t1;
 
 # Check table.

mysql-test/suite/innodb_gis/t/rtree_search.test

@@ -38,9 +38,10 @@ select count(*) from t1 where MBRWithin(t1.c2, @g1);
 set @g1 = ST_GeomFromText('Polygon((100 100,100 800,800 800,800 100,100 100))');
 select count(*) from t1 where MBRWithin(t1.c2, @g1);
 
-#SET DEBUG='+d, rtr_pessimistic_position';
+#SET @save_dbug= @@session.debug_dbug;
+#SET debug_dbug = '+d,rtr_pessimistic_position';
 #select count(*) from t1 where MBRWithin(t1.c2, @g1);
-#SET DEBUG='-d, rtr_pessimistic_position';
+#SET debug_dbug = @save_dbug;
 
 # Equality search
 set @g1 = ST_GeomFromText('Point(1 1)');

sql/mysqld.cc

@@ -772,7 +772,7 @@ mysql_mutex_t LOCK_prepared_stmt_count;
 mysql_mutex_t LOCK_des_key_file;
 #endif
 mysql_rwlock_t LOCK_grant, LOCK_sys_init_connect, LOCK_sys_init_slave;
-mysql_rwlock_t LOCK_system_variables_hash;
+mysql_prlock_t LOCK_system_variables_hash;
 mysql_cond_t COND_thread_count, COND_start_thread;
 pthread_t signal_thread;
 pthread_attr_t connection_attrib;
@@ -2352,7 +2352,7 @@ static void clean_up_mutexes()
  mysql_rwlock_destroy(&LOCK_sys_init_connect);
  mysql_rwlock_destroy(&LOCK_sys_init_slave);
  mysql_mutex_destroy(&LOCK_global_system_variables);
- mysql_rwlock_destroy(&LOCK_system_variables_hash);
+ mysql_prlock_destroy(&LOCK_system_variables_hash);
  mysql_mutex_destroy(&LOCK_short_uuid_generator);
  mysql_mutex_destroy(&LOCK_prepared_stmt_count);
  mysql_mutex_destroy(&LOCK_error_messages);
@@ -4690,7 +4690,7 @@ static int init_thread_environment()
  &LOCK_global_system_variables, MY_MUTEX_INIT_FAST);
  mysql_mutex_record_order(&LOCK_active_mi, &LOCK_global_system_variables);
  mysql_mutex_record_order(&LOCK_status, &LOCK_thread_count);
- mysql_rwlock_init(key_rwlock_LOCK_system_variables_hash,
+ mysql_prlock_init(key_rwlock_LOCK_system_variables_hash,
  &LOCK_system_variables_hash);
  mysql_mutex_init(key_LOCK_prepared_stmt_count,
  &LOCK_prepared_stmt_count, MY_MUTEX_INIT_FAST);

sql/mysqld.h

@@ -585,7 +585,7 @@ extern mysql_mutex_t LOCK_des_key_file;
 extern mysql_mutex_t LOCK_server_started;
 extern mysql_cond_t COND_server_started;
 extern mysql_rwlock_t LOCK_grant, LOCK_sys_init_connect, LOCK_sys_init_slave;
-extern mysql_rwlock_t LOCK_system_variables_hash;
+extern mysql_prlock_t LOCK_system_variables_hash;
 extern mysql_cond_t COND_thread_count, COND_start_thread;
 extern mysql_cond_t COND_manager;
 extern mysql_cond_t COND_slave_background;

sql/set_var.cc

@@ -597,10 +597,10 @@ int mysql_del_sys_var_chain(sys_var *first)
 {
  int result= 0;
 
- mysql_rwlock_wrlock(&LOCK_system_variables_hash);
+ mysql_prlock_wrlock(&LOCK_system_variables_hash);
  for (sys_var *var= first; var; var= var->next)
  result|= my_hash_delete(&system_variable_hash, (uchar*) var);
- mysql_rwlock_unlock(&LOCK_system_variables_hash);
+ mysql_prlock_unlock(&LOCK_system_variables_hash);
 
  return result;
 }
@@ -1082,7 +1082,7 @@ int fill_sysvars(THD *thd, TABLE_LIST *tables, COND *cond)
 
  cond= make_cond_for_info_schema(thd, cond, tables);
  thd->count_cuted_fields= CHECK_FIELD_WARN;
- mysql_rwlock_rdlock(&LOCK_system_variables_hash);
+ mysql_prlock_rdlock(&LOCK_system_variables_hash);
 
  for (uint i= 0; i < system_variable_hash.records; i++)
  {
@@ -1244,7 +1244,7 @@ int fill_sysvars(THD *thd, TABLE_LIST *tables, COND *cond)
  }
  res= 0;
 end:
- mysql_rwlock_unlock(&LOCK_system_variables_hash);
+ mysql_prlock_unlock(&LOCK_system_variables_hash);
  thd->count_cuted_fields= save_count_cuted_fields;
  return res;
 }

sql/sql_plugin.cc

@@ -1397,10 +1397,10 @@ static int plugin_initialize(MEM_ROOT *tmp_root, struct st_plugin_int *plugin,
 
  mysql_mutex_unlock(&LOCK_plugin);
 
- mysql_rwlock_wrlock(&LOCK_system_variables_hash);
+ mysql_prlock_wrlock(&LOCK_system_variables_hash);
  if (test_plugin_options(tmp_root, plugin, argc, argv))
  state= PLUGIN_IS_DISABLED;
- mysql_rwlock_unlock(&LOCK_system_variables_hash);
+ mysql_prlock_unlock(&LOCK_system_variables_hash);
 
  if (options_only || state == PLUGIN_IS_DISABLED)
  {
@@ -2803,11 +2803,11 @@ sys_var *find_sys_var_ex(THD *thd, const char *str, size_t length,
 
  if (!locked)
  mysql_mutex_lock(&LOCK_plugin);
- mysql_rwlock_rdlock(&LOCK_system_variables_hash);
+ mysql_prlock_rdlock(&LOCK_system_variables_hash);
  if ((var= intern_find_sys_var(str, length)) &&
  (pi= var->cast_pluginvar()))
  {
- mysql_rwlock_unlock(&LOCK_system_variables_hash);
+ mysql_prlock_unlock(&LOCK_system_variables_hash);
  LEX *lex= thd ? thd->lex : 0;
  if (!(plugin= intern_plugin_lock(lex, plugin_int_to_ref(pi->plugin))))
  var= NULL; /* failed to lock it, it must be uninstalling */
@@ -2820,7 +2820,7 @@ sys_var *find_sys_var_ex(THD *thd, const char *str, size_t length,
  }
  }
  else
- mysql_rwlock_unlock(&LOCK_system_variables_hash);
+ mysql_prlock_unlock(&LOCK_system_variables_hash);
  if (!locked)
  mysql_mutex_unlock(&LOCK_plugin);
 
@@ -3049,9 +3049,9 @@ static uchar *intern_sys_var_ptr(THD* thd, int offset, bool global_lock)
  if (!thd->variables.dynamic_variables_ptr ||
  (uint)offset > thd->variables.dynamic_variables_head)
  {
- mysql_rwlock_rdlock(&LOCK_system_variables_hash);
+ mysql_prlock_rdlock(&LOCK_system_variables_hash);
  sync_dynamic_session_variables(thd, global_lock);
- mysql_rwlock_unlock(&LOCK_system_variables_hash);
+ mysql_prlock_unlock(&LOCK_system_variables_hash);
  }
  DBUG_RETURN((uchar*)thd->variables.dynamic_variables_ptr + offset);
 }
@@ -3166,7 +3166,7 @@ static void cleanup_variables(struct system_variables *vars)
  st_bookmark *v;
  uint idx;
 
- mysql_rwlock_rdlock(&LOCK_system_variables_hash);
+ mysql_prlock_rdlock(&LOCK_system_variables_hash);
  for (idx= 0; idx < bookmark_hash.records; idx++)
  {
  v= (st_bookmark*) my_hash_element(&bookmark_hash, idx);
@@ -3185,7 +3185,7 @@ static void cleanup_variables(struct system_variables *vars)
  *ptr= NULL;
  }
  }
- mysql_rwlock_unlock(&LOCK_system_variables_hash);
+ mysql_prlock_unlock(&LOCK_system_variables_hash);
 
  DBUG_ASSERT(vars->table_plugin == NULL);
  DBUG_ASSERT(vars->tmp_table_plugin == NULL);
@@ -4240,10 +4240,10 @@ int thd_key_create(MYSQL_THD_KEY_T *key)
  PLUGIN_VAR_NOSYSVAR | PLUGIN_VAR_NOCMDOPT;
  char namebuf[256];
  snprintf(namebuf, sizeof(namebuf), "%u", thd_key_no++);
- mysql_rwlock_wrlock(&LOCK_system_variables_hash);
+ mysql_prlock_wrlock(&LOCK_system_variables_hash);
  // non-letters in the name as an extra safety
  st_bookmark *bookmark= register_var("\a\v\a\t\a\r", namebuf, flags);
- mysql_rwlock_unlock(&LOCK_system_variables_hash);
+ mysql_prlock_unlock(&LOCK_system_variables_hash);
  if (bookmark)
  {
  *key= bookmark->offset;