[Commits] 8ffee1bf328: Merge remote-tracking branch 'origin/10.4' into bb-10.4-galera4

28 Nov 2018

--- a/mysql-test/suite/galera/r/partition.result
+++ b/mysql-test/suite/galera/r/partition.result
@@@ -121,11 -119,11 +121,11 @@@ SET GLOBAL wsrep_load_data_splitting = 
  CREATE TABLE t1 (pk INT PRIMARY KEY)
  ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2;
  connection node_2;
- SELECT COUNT(*) = 20002 FROM t1;
- COUNT(*) = 20002
- 1
+ SELECT COUNT(*) FROM t1;
+ COUNT(*)
+ 20002
  wsrep_last_committed_diff
 -1
 +AS_EXPECTED_3_or_5
  DROP TABLE t1;
  # Case 2: wsrep_load_data_splitting = ON & LOAD DATA with 101 entries.
  connection node_1;
@@@ -146,11 -144,11 +146,11 @@@ SET GLOBAL wsrep_load_data_splitting = 
  CREATE TABLE t1 (pk INT PRIMARY KEY)
  ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2;
  connection node_2;
- SELECT COUNT(*) = 20002 FROM t1;
- COUNT(*) = 20002
- 1
+ SELECT COUNT(*) FROM t1;
+ COUNT(*)
+ 20002
  wsrep_last_committed_diff
 -1
 +AS_EXPECTED_1_or_2
  DROP TABLE t1;
  connection node_1;
  SET GLOBAL wsrep_load_data_splitting = 1;;
diff --cc mysql-test/suite/galera/t/partition.test
index 7fa6b9e800c,0159ef8f607..13e09a4e3e6
--- a/mysql-test/suite/galera/t/partition.test
+++ b/mysql-test/suite/galera/t/partition.test
@@@ -129,14 -129,14 +129,17 @@@ CREATE TABLE t1 (pk INT PRIMARY KEY
  --let $wsrep_last_committed_after = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME = 'wsrep_last_committed'`
  
  --connection node_2
- SELECT COUNT(*) = 20002 FROM t1;
+ --let $wait_condition = SELECT COUNT(*) = 20002 FROM t1;
+ --source include/wait_condition.inc
+ 
+ SELECT COUNT(*) FROM t1;
  
 -# LOAD-ing 20002 rows causes 3 commits to be registered
 +# LOAD-ing 20002 rows causes
 +# 3 commits to be registered when the Galera library does not support streaming replication and
 +# 5 commits to be registered when the Galera library supports streaming replication
  --disable_query_log
 ---eval SELECT $wsrep_last_committed_after = $wsrep_last_committed_before + 3 AS wsrep_last_committed_diff;
 +--replace_result 3 AS_EXPECTED_3_or_5 5 AS_EXPECTED_3_or_5
 +--eval SELECT $wsrep_last_committed_after - $wsrep_last_committed_before AS wsrep_last_committed_diff;
  --enable_query_log
  
  DROP TABLE t1;
@@@ -189,14 -192,13 +195,16 @@@ CREATE TABLE t1 (pk INT PRIMARY KEY
  --let $wsrep_last_committed_after = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME = 'wsrep_last_committed'`
  
  --connection node_2
- SELECT COUNT(*) = 20002 FROM t1;
+ --let $wait_condition = SELECT COUNT(*) = 20002 FROM t1;
+ --source include/wait_condition.inc
+ SELECT COUNT(*) FROM t1;
  
 -# LOAD-ing 20002 rows causes 1 commit to be registered
 +# LOAD-ing 20002 rows causes
 +# 1 commit  to be registered when the Galera library does not support streaming replication and
 +# 2 commits to be registered when the Galera library supports streaming replication
  --disable_query_log
 ---eval SELECT $wsrep_last_committed_after = $wsrep_last_committed_before + 1 AS wsrep_last_committed_diff;
 +--replace_result 1 AS_EXPECTED_1_or_2 2 AS_EXPECTED_1_or_2
 +--eval SELECT $wsrep_last_committed_after - $wsrep_last_committed_before AS wsrep_last_committed_diff;
  --enable_query_log
  
  DROP TABLE t1;
diff --cc sql/sql_parse.cc
index 0567cec72b4,3b2e57abcf5..57bdacc96ba
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@@ -2404,12 -2384,9 +2404,10 @@@ com_multi_end
                    || thd->get_stmt_da()->is_disabled());
      /* wsrep BF abort in query exec phase */
      mysql_mutex_lock(&thd->LOCK_thd_data);
 -    do_end_of_statement= thd->wsrep_conflict_state != REPLAYING &&
 -                         thd->wsrep_conflict_state != RETRY_AUTOCOMMIT &&
 -                         !thd->killed;
 +    do_end_of_statement=
-       thd->wsrep_trx().state() != wsrep::transaction::s_replaying;
- #ifdef TODO
-             thd->wsrep_conflict_state != REPLAYING &&
-             thd->wsrep_conflict_state != RETRY_AUTOCOMMIT;
- #endif
++      thd->wsrep_trx().state() != wsrep::transaction::s_replaying
++      && !thd->killed;
++
      mysql_mutex_unlock(&thd->LOCK_thd_data);
    }
    else
diff --cc storage/innobase/row/row0ins.cc
index 69a73e8284c,27df0a9249d..340d158222e
--- a/storage/innobase/row/row0ins.cc
+++ b/storage/innobase/row/row0ins.cc
@@@ -48,12 -44,6 +44,10 @@@ Created 4/20/1996 Heikki Tuur
  #include "buf0lru.h"
  #include "fts0fts.h"
  #include "fts0types.h"
- #include "m_string.h"
- #include "gis0geo.h"
 +#include "wsrep_api.h"
 +#include "mysql/service_wsrep.h"
 +#include "wsrep_mysqld.h"
 +#include "mysql/service_wsrep.h"
  
  /*************************************************************************
  IMPORTANT NOTE: Any operation that generates redo MUST check that there
diff --cc storage/innobase/row/row0sel.cc
index 83ee7cb53ee,5e7894d3ca7..c88912dc94f
--- a/storage/innobase/row/row0sel.cc
+++ b/storage/innobase/row/row0sel.cc
@@@ -53,16 -53,7 +53,14 @@@ Created 12/19/1997 Heikki Tuur
  #include "row0mysql.h"
  #include "buf0lru.h"
  #include "srv0srv.h"
- #include "ha_prototypes.h"
  #include "srv0mon.h"
- #include "ut0new.h"
 +#include "m_string.h" /* for my_sys.h */
 +#include "my_sys.h" /* DEBUG_SYNC_C */
 +
 +#include "my_compare.h" /* enum icp_result */
 +#include "thr_lock.h"
 +#include "handler.h"
 +#include "ha_innodb.h"
  
  /* Maximum number of rows to prefetch; MySQL interface has another parameter */
  #define SEL_MAX_N_PREFETCH	16

    

jan

tags

participants (1)