Merge branch '10.2' into bb-10.2-mdev9543

- Make Window Functions errors use the MariaDB's extra error range.
- Fix a trivial bug in check_error_mesg

6 files changed, 22 insertions, 1 deletions

diff --git a/storage/mroonga/mrn_table.cpp b/storage/mroonga/mrn_table.cpp
index 144dbe0c530..96f24ff2e00 100644
--- a/storage/mroonga/mrn_table.cpp
+++ b/storage/mroonga/mrn_table.cpp
@@ -998,7 +998,7 @@ int mrn_free_share(MRN_SHARE *share)
 
 TABLE_SHARE *mrn_get_table_share(TABLE_LIST *table_list, int *error)
 {
-  uint key_length;
+  uint key_length __attribute__((unused));
   TABLE_SHARE *share;
   THD *thd = current_thd;
   MRN_DBUG_ENTER_FUNCTION();
diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_after_insert_multithread.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_after_insert_multithread.result
index c09ec340ccb..412ae455898 100644
--- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_after_insert_multithread.result
+++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_after_insert_multithread.result
@@ -6,7 +6,11 @@ FULLTEXT INDEX ft(title)
 );
 INSERT INTO diaries VALUES("Hello mroonga!");
 INSERT INTO diaries VALUES("It's funny.");
+CONNECT  thread2, localhost, root, ,;
+connection thread2;
 INSERT INTO diaries VALUES("Happy birthday!");
+disconnect thread2;
+connection default;
 SHOW STATUS LIKE 'mroonga_count_skip';
 Variable_name	Value
 Mroonga_count_skip	0
diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/variable_max_n_records_for_estimate_global.result b/storage/mroonga/mysql-test/mroonga/storage/r/variable_max_n_records_for_estimate_global.result
index 0181fe02d84..9968abaf18c 100644
--- a/storage/mroonga/mysql-test/mroonga/storage/r/variable_max_n_records_for_estimate_global.result
+++ b/storage/mroonga/mysql-test/mroonga/storage/r/variable_max_n_records_for_estimate_global.result
@@ -13,8 +13,12 @@ INSERT INTO ids VALUES (8);
 INSERT INTO ids VALUES (9);
 INSERT INTO ids VALUES (10);
 SET GLOBAL mroonga_max_n_records_for_estimate = 1;
+CONNECT  new_connection, localhost, root, ,;
+connection new_connection;
 EXPLAIN SELECT * FROM ids WHERE id > 5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	ids	range	PRIMARY	PRIMARY	4	NULL	1	Using where; Using index
+connection default;
+disconnect new_connection;
 SET GLOBAL mroonga_max_n_records_for_estimate = DEFAULT;
 DROP TABLE ids;
diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/fulltext_order_transaction.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/fulltext_order_transaction.result
index 3da64b2de1f..590abf0a989 100644
--- a/storage/mroonga/mysql-test/mroonga/wrapper/r/fulltext_order_transaction.result
+++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/fulltext_order_transaction.result
@@ -27,12 +27,15 @@ id	title	body
 1	survey	will start groonga!
 2	groonga (1)	starting groonga...
 3	groonga (2)	started groonga.
+CONNECT search_connection, localhost, root;
 USE test;
 SELECT * FROM diaries
 WHERE MATCH(body) AGAINST("groonga")
 ORDER BY id;
 id	title	body
+connection default;
 COMMIT;
+connection search_connection;
 SELECT * FROM diaries
 WHERE MATCH(body) AGAINST("groonga")
 ORDER BY id;
@@ -40,6 +43,8 @@ id	title	body
 1	survey	will start groonga!
 2	groonga (1)	starting groonga...
 3	groonga (2)	started groonga.
+disconnect search_connection;
+connection default;
 SELECT * FROM diaries
 WHERE MATCH(body) AGAINST("groonga")
 ORDER BY id;
diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/transaction_query_cache.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/transaction_query_cache.result
index 54afac7a1a7..61fbe239a35 100644
--- a/storage/mroonga/mysql-test/mroonga/wrapper/r/transaction_query_cache.result
+++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/transaction_query_cache.result
@@ -11,18 +11,23 @@ simple_table	CREATE TABLE `simple_table` (
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8 COMMENT='ENGINE "InnoDB"'
 INSERT INTO simple_table (id) VALUES (1),(2);
+CONNECT second_connection, localhost, root;
 USE test;
 START TRANSACTION;
 INSERT INTO simple_table (id) VALUES (3);
+connection default;
 SELECT * FROM simple_table;
 id
 1
 2
+connection second_connection;
 COMMIT;
+connection default;
 SELECT * FROM simple_table;
 id
 1
 2
 3
 DROP TABLE simple_table;
+disconnect second_connection;
 SET GLOBAL query_cache_size = @tmp_query_cache_size;
diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/variable_match_escalation_threshold_global.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/variable_match_escalation_threshold_global.result
index c98847cb50a..d66c0c025e5 100644
--- a/storage/mroonga/mysql-test/mroonga/wrapper/r/variable_match_escalation_threshold_global.result
+++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/variable_match_escalation_threshold_global.result
@@ -20,8 +20,11 @@ SELECT * FROM diaries WHERE MATCH (tags) AGAINST ("gr" IN BOOLEAN MODE);
 id	title	tags
 1	Hello groonga!	groonga install
 SET GLOBAL mroonga_match_escalation_threshold = -1;
+CONNECT search_connection, localhost, root;
 USE test;
 SELECT * FROM diaries WHERE MATCH (tags) AGAINST ("gr" IN BOOLEAN MODE);
 id	title	tags
+disconnect search_connection;
+connection default;
 SET GLOBAL mroonga_match_escalation_threshold = DEFAULT;
 DROP TABLE diaries;