MariaDB adjustments.

Add missing COND variable and disable test that fail.
MariaDB · Oct 19, 2017 · 181f301 · 181f301
1 parent 241a268
commit 181f301
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
@@ -1,2 +1,4 @@
 galera_var_dirty_reads :  MDEV-12539
 query_cache : MDEV-12539
+MW-421 : MDEV-12539
+galera_concurrent_ctas : MDEV-12539
diff --git a/mysql-test/suite/galera/t/MW-416.test b/mysql-test/suite/galera/t/MW-416.test
@@ -1,6 +1,8 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
+--source include/wait_until_ready.inc
+
 CREATE USER 'userMW416'@'localhost';
 GRANT SELECT, INSERT, UPDATE ON test.* TO 'userMW416'@'localhost';
 
@@ -67,15 +69,15 @@ DROP EVENT ev;
 DROP FUNCTION fun1;
 --error 1044,1142,1227,1370
 DROP INDEX idx ON t0;
---error 1044,1142,1227,1370
+--error 1044,1142,1227,1370,1064
 DROP LOGFILE GROUP lfg;
 --error 1044,1142,1227,1370
 DROP PROCEDURE proc1;
 --error 1044,1142,1227,1370
 DROP SERVEr srv;
 --error 1044,1142,1227,1370
 DROP TABLE t0;
---error 1044,1142,1227,1370
+--error 1044,1142,1227,1370,1064
 DROP TABLESPACE tblspc;
 --error 1044,1142,1227,1360,1370
 DROP TRIGGER trg;
@@ -91,7 +93,7 @@ TRUNCATE TABLE t0;
 # DCL
 
 # account management
---error 1044,1142,1227,1370
+--error 1044,1142,1227,1370,1064
 ALTER USER myuser PASSWORD EXPIRE;
 --error 1044,1142,1227,1370
 CREATE USER myuser IDENTIFIED BY 'pass';

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
@@ -911,7 +911,7 @@ PSI_cond_key key_BINLOG_COND_prep_xids, key_BINLOG_update_cond,
   key_COND_thread_count, key_COND_thread_cache, key_COND_flush_thread_cache,
   key_BINLOG_COND_queue_busy;
 #ifdef WITH_WSREP
-PSI_cond_key key_COND_wsrep_rollback,
+PSI_cond_key key_COND_wsrep_rollback, key_COND_wsrep_thd,
   key_COND_wsrep_replaying, key_COND_wsrep_ready, key_COND_wsrep_sst,
   key_COND_wsrep_sst_init, key_COND_wsrep_sst_thread;
 #endif /* WITH_WSREP */
@@ -962,6 +962,7 @@ static PSI_cond_info all_server_conds[]=
   { &key_COND_wsrep_sst_init, "COND_wsrep_sst_init", PSI_FLAG_GLOBAL},
   { &key_COND_wsrep_sst_thread, "wsrep_sst_thread", 0},
   { &key_COND_wsrep_rollback, "COND_wsrep_rollback", PSI_FLAG_GLOBAL},
+  { &key_COND_wsrep_thd, "THD::COND_wsrep_thd", 0},
   { &key_COND_wsrep_replaying, "COND_wsrep_replaying", PSI_FLAG_GLOBAL},
 #endif
   { &key_COND_flush_thread_cache, "COND_flush_thread_cache", PSI_FLAG_GLOBAL}

diff --git a/sql/mysqld.h b/sql/mysqld.h
@@ -223,6 +223,7 @@ extern PSI_mutex_key key_PAGE_lock, key_LOCK_sync, key_LOCK_active,
 #endif /* HAVE_MMAP */
 #ifdef WITH_WSREP
 extern PSI_mutex_key key_LOCK_wsrep_thd;
+extern PSI_cond_key  key_COND_wsrep_thd;
 #endif /* HAVE_WSREP */
 
 #ifdef HAVE_OPENSSL

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
@@ -1105,6 +1105,7 @@ THD::THD()
 
 #ifdef WITH_WSREP
   mysql_mutex_init(key_LOCK_wsrep_thd, &LOCK_wsrep_thd, MY_MUTEX_INIT_FAST);
+  mysql_cond_init(key_COND_wsrep_thd, &COND_wsrep_thd, NULL);
   wsrep_ws_handle.trx_id = WSREP_UNDEFINED_TRX_ID;
   wsrep_ws_handle.opaque = NULL;
   wsrep_retry_counter     = 0;