Merge branch '10.0-galera' into 10.1

2026-01-06 05:22:24 +03:00 · 2018-06-12 19:39:37 +03:00
parent aa59ecec89 215d652c66
commit 6e55236c0a
51 changed files with 590 additions and 380 deletions
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -2940,6 +2940,7 @@ public:
    query_id_t first_query_id;
  } binlog_evt_union;

+  mysql_cond_t              COND_wsrep_thd;
  /**
    Internal parser state.
    Note that since the parser is not re-entrant, we keep only one parser