Merge branch '10.1' into 10.2

2025-07-29 05:21:33 +03:00 · 2018-06-21 23:47:39 +02:00
parent fe3f9fa918 c09a8b5b36
commit b942aa34c1
185 changed files with 2884 additions and 1966 deletions
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@ -3119,6 +3119,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