Merge bb-10.2-ext into 10.3

22 files changed, 361 insertions, 302 deletions

diff --git a/include/my_dbug.h b/include/my_dbug.h
index d93c86141d6..f0d4acc358b 100644
--- a/include/my_dbug.h
+++ b/include/my_dbug.h
@@ -209,10 +209,14 @@ void debug_sync_point(const char* lock_name, uint lock_timeout);
 
 #ifdef __cplusplus
 }
+/*
+  DBUG_LOG() was initially intended for InnoDB. To be able to use it elsewhere
+  one should #include <sstream>. We intentially avoid including it here to save
+  compilation time.
+*/
 # ifdef DBUG_OFF
 #  define DBUG_LOG(keyword, v) do {} while (0)
 # else
-#  include <sstream>
 #  define DBUG_LOG(keyword, v) do { \
   if (_db_pargs_(__LINE__, keyword)) { \
     std::ostringstream _db_s; _db_s << v; \
diff --git a/mysql-test/suite/innodb/r/innodb-lru-force-no-free-page.result b/mysql-test/suite/innodb/r/innodb-lru-force-no-free-page.result
index b9fee24c7ff..09e53b59d9d 100644
--- a/mysql-test/suite/innodb/r/innodb-lru-force-no-free-page.result
+++ b/mysql-test/suite/innodb/r/innodb-lru-force-no-free-page.result
@@ -1,9 +1,10 @@
-call mtr.add_suppression("\\[Warning\\] InnoDB: Difficult to find free blocks in the buffer pool.");
+call mtr.add_suppression("InnoDB: Difficult to find free blocks in the buffer pool");
+SET @saved_debug = @@SESSION.debug_dbug;
 SET SESSION debug_dbug="+d,ib_lru_force_no_free_page";
 CREATE TABLE t1 (j LONGBLOB) ENGINE = InnoDB;
 BEGIN;
 INSERT INTO t1 VALUES (repeat('abcdefghijklmnopqrstuvwxyz',200));
 COMMIT;
-SET SESSION debug_dbug="";
+SET debug_dbug = @saved_debug;
 DROP TABLE t1;
 FOUND 1 /InnoDB: Difficult to find free blocks / in mysqld.1.err
diff --git a/mysql-test/suite/innodb/r/truncate_inject.result b/mysql-test/suite/innodb/r/truncate_inject.result
new file mode 100644
index 00000000000..5ec532a0f83
--- /dev/null
+++ b/mysql-test/suite/innodb/r/truncate_inject.result
@@ -0,0 +1,114 @@
+SET @save_dbug = @@SESSION.debug_dbug;
+call mtr.add_suppression("InnoDB: Flagged corruption of .* in table `test`\\.`t` in TRUNCATE TABLE");
+# 1. Error in assigning undo logs for truncate action
+CREATE TABLE t (i int PRIMARY KEY, f float UNIQUE, c char(100), INDEX ck(c))
+ENGINE = InnoDB;
+insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
+check table t;
+Table	Op	Msg_type	Msg_text
+test.t	check	status	OK
+SET debug_dbug = '+d,ib_err_trunc_assigning_undo_log';
+truncate table t;
+ERROR HY000: Got error 168 "Unknown (generic) error from engine" from storage engine InnoDB
+SET debug_dbug = @save_dbug;
+check table t;
+Table	Op	Msg_type	Msg_text
+test.t	check	status	OK
+select * from t;
+i	f	c
+1	1.1	a
+2	2.2	b
+3	3.3	c
+# 2. Error while preparing for truncate
+SET debug_dbug = '+d,ib_err_trunc_preparing_for_truncate';
+truncate table t;
+ERROR HY000: Got error 168 "Unknown (generic) error from engine" from storage engine InnoDB
+SET debug_dbug = @save_dbug;
+check table t;
+Table	Op	Msg_type	Msg_text
+test.t	check	status	OK
+select * from t;
+i	f	c
+1	1.1	a
+2	2.2	b
+3	3.3	c
+# 3. Error while dropping/creating indexes
+SET debug_dbug = '+d,ib_err_trunc_drop_index';
+truncate table t;
+ERROR HY000: Got error 168 "Unknown (generic) error from engine" from storage engine InnoDB
+SET debug_dbug = @save_dbug;
+check table t;
+Table	Op	Msg_type	Msg_text
+test.t	check	Warning	InnoDB: Index PRIMARY is marked as corrupted
+test.t	check	error	Corrupt
+select * from t;
+Got one of the listed errors
+drop table t;
+CREATE TABLE t (i int PRIMARY KEY, f float UNIQUE, c char(100), INDEX ck(c))
+ENGINE = InnoDB;
+insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
+check table t;
+Table	Op	Msg_type	Msg_text
+test.t	check	status	OK
+SET debug_dbug = '+d,ib_err_trunc_create_index';
+truncate table t;
+ERROR HY000: Got error 168 "Unknown (generic) error from engine" from storage engine InnoDB
+SET debug_dbug = @save_dbug;
+check table t;
+Table	Op	Msg_type	Msg_text
+test.t	check	Warning	InnoDB: Index PRIMARY is marked as corrupted
+test.t	check	error	Corrupt
+select * from t;
+Got one of the listed errors
+drop table t;
+CREATE TABLE t (i int PRIMARY KEY, f float UNIQUE, c char(100), INDEX ck(c))
+ENGINE = InnoDB;
+insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
+check table t;
+Table	Op	Msg_type	Msg_text
+test.t	check	status	OK
+SET debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
+truncate table t;
+SET debug_dbug = @save_dbug;
+check table t;
+Table	Op	Msg_type	Msg_text
+test.t	check	status	OK
+select * from t;
+i	f	c
+drop table t;
+# 4. Error while completing truncate of table involving FTS
+CREATE TABLE t (i int PRIMARY KEY, f float UNIQUE, c char(100),
+FULLTEXT INDEX(c)) ENGINE = InnoDB;
+insert into t values (1, 1.1, 'mysql is now oracle company'),
+(2, 2.2, 'innodb is part of mysql'),
+(3, 3.3, 'innodb is default storage engine of mysql');
+check table t;
+Table	Op	Msg_type	Msg_text
+test.t	check	status	OK
+SET debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
+truncate table t;
+SET debug_dbug = @save_dbug;
+check table t;
+Table	Op	Msg_type	Msg_text
+test.t	check	status	OK
+select * from t;
+i	f	c
+drop table t;
+# 5. Error while updating sys-tables
+CREATE TABLE t (i int PRIMARY KEY, f float UNIQUE, c char(100),
+FULLTEXT INDEX(c)) ENGINE = InnoDB;
+insert into t values (1, 1.1, 'mysql is now oracle company'),
+(2, 2.2, 'innodb is part of mysql'),
+(3, 3.3, 'innodb is default storage engine of mysql');
+check table t;
+Table	Op	Msg_type	Msg_text
+test.t	check	status	OK
+SET debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
+truncate table t;
+SET debug_dbug = @save_dbug;
+check table t;
+Table	Op	Msg_type	Msg_text
+test.t	check	status	OK
+select * from t order by i;
+i	f	c
+drop table t;
diff --git a/mysql-test/suite/innodb/t/innodb-lru-force-no-free-page.test b/mysql-test/suite/innodb/t/innodb-lru-force-no-free-page.test
index e358446eca9..d4f08b5afe6 100644
--- a/mysql-test/suite/innodb/t/innodb-lru-force-no-free-page.test
+++ b/mysql-test/suite/innodb/t/innodb-lru-force-no-free-page.test
@@ -1,8 +1,10 @@
 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/not_embedded.inc
 
-call mtr.add_suppression("\\[Warning\\] InnoDB: Difficult to find free blocks in the buffer pool.");
+call mtr.add_suppression("InnoDB: Difficult to find free blocks in the buffer pool");
 
+SET @saved_debug = @@SESSION.debug_dbug;
 SET SESSION debug_dbug="+d,ib_lru_force_no_free_page";
 
 CREATE TABLE t1 (j LONGBLOB) ENGINE = InnoDB;
@@ -10,15 +12,13 @@ BEGIN;
 INSERT INTO t1 VALUES (repeat('abcdefghijklmnopqrstuvwxyz',200));
 COMMIT;
 
-SET SESSION debug_dbug="";
+SET debug_dbug = @saved_debug;
 
 DROP TABLE t1;
 
 #
 # There should be only one message
 #
-let SEARCH_RANGE= -50000;
 let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err;
 --let SEARCH_PATTERN=InnoDB: Difficult to find free blocks 
 --source include/search_pattern_in_file.inc
-
diff --git a/mysql-test/suite/innodb/t/truncate_inject.test b/mysql-test/suite/innodb/t/truncate_inject.test
new file mode 100644
index 00000000000..35e516324bb
--- /dev/null
+++ b/mysql-test/suite/innodb/t/truncate_inject.test
@@ -0,0 +1,97 @@
+# This test is based on innodb_zip.wl6501_error_1 in MySQL 5.7.
+
+--source include/have_innodb.inc
+--source include/innodb_row_format.inc
+--source include/have_debug.inc
+
+SET @save_dbug = @@SESSION.debug_dbug;
+
+call mtr.add_suppression("InnoDB: Flagged corruption of .* in table `test`\\.`t` in TRUNCATE TABLE");
+
+--echo # 1. Error in assigning undo logs for truncate action
+CREATE TABLE t (i int PRIMARY KEY, f float UNIQUE, c char(100), INDEX ck(c))
+ENGINE = InnoDB;
+insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
+check table t;
+#
+SET debug_dbug = '+d,ib_err_trunc_assigning_undo_log';
+--error ER_GET_ERRNO
+truncate table t;
+SET debug_dbug = @save_dbug;
+check table t;
+select * from t;
+
+--echo # 2. Error while preparing for truncate
+SET debug_dbug = '+d,ib_err_trunc_preparing_for_truncate';
+--error ER_GET_ERRNO
+truncate table t;
+SET debug_dbug = @save_dbug;
+check table t;
+select * from t;
+
+--echo # 3. Error while dropping/creating indexes
+SET debug_dbug = '+d,ib_err_trunc_drop_index';
+--error ER_GET_ERRNO
+truncate table t;
+SET debug_dbug = @save_dbug;
+check table t;
+--error ER_TABLE_CORRUPT,ER_GET_ERRNO
+select * from t;
+drop table t;
+
+CREATE TABLE t (i int PRIMARY KEY, f float UNIQUE, c char(100), INDEX ck(c))
+ENGINE = InnoDB;
+insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
+check table t;
+
+SET debug_dbug = '+d,ib_err_trunc_create_index';
+--error ER_GET_ERRNO
+truncate table t;
+SET debug_dbug = @save_dbug;
+check table t;
+--error ER_TABLE_CORRUPT,ER_GET_ERRNO
+select * from t;
+drop table t;
+
+CREATE TABLE t (i int PRIMARY KEY, f float UNIQUE, c char(100), INDEX ck(c))
+ENGINE = InnoDB;
+insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
+check table t;
+
+SET debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
+truncate table t;
+SET debug_dbug = @save_dbug;
+
+check table t;
+select * from t;
+drop table t;
+
+--echo # 4. Error while completing truncate of table involving FTS
+CREATE TABLE t (i int PRIMARY KEY, f float UNIQUE, c char(100),
+FULLTEXT INDEX(c)) ENGINE = InnoDB;
+insert into t values (1, 1.1, 'mysql is now oracle company'),
+		     (2, 2.2, 'innodb is part of mysql'),
+		     (3, 3.3, 'innodb is default storage engine of mysql');
+check table t;
+SET debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
+truncate table t;
+SET debug_dbug = @save_dbug;
+
+check table t;
+select * from t;
+drop table t;
+
+--echo # 5. Error while updating sys-tables
+CREATE TABLE t (i int PRIMARY KEY, f float UNIQUE, c char(100),
+FULLTEXT INDEX(c)) ENGINE = InnoDB;
+insert into t values (1, 1.1, 'mysql is now oracle company'),
+		     (2, 2.2, 'innodb is part of mysql'),
+		     (3, 3.3, 'innodb is default storage engine of mysql');
+check table t;
+SET debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
+truncate table t;
+SET debug_dbug = @save_dbug;
+
+check table t;
+select * from t order by i;
+drop table t;
diff --git a/mysql-test/suite/innodb_zip/include/innodb_wl6501_error.inc b/mysql-test/suite/innodb_zip/include/innodb_wl6501_error.inc
deleted file mode 100644
index 03400c79bef..00000000000
--- a/mysql-test/suite/innodb_zip/include/innodb_wl6501_error.inc
+++ /dev/null
@@ -1,225 +0,0 @@
-#
-# WL#6501: make truncate table atomic
-#
-
---source include/have_innodb.inc
---source include/have_debug.inc
-
---disable_query_log
-# suppress expected warnings
-call mtr.add_suppression("Unable to truncate FTS index for table");
-call mtr.add_suppression("Unable to assign a new identifier to table "
-			 "`.*`\.`.*` after truncating it");
-call mtr.add_suppression("Flagged corruption of .* in table "
-			 "`.*`\.`.*` in TRUNCATE TABLE");
-call mtr.add_suppression("Parent table of FTS auxiliary table "
-			 ".*\/.* not found");
---enable_query_log
-################################################################################
-#
-# Will test following scenarios:
-# 1. Error in assigning undo logs for truncate action.
-# 2. Error while preparing for truncate.
-# 3. Error while dropping/creating indexes.
-# 4. Error while completing truncate of table involving FTS.
-# 5. Error while updating sys-tables.
-#
-################################################################################
-
-#-----------------------------------------------------------------------------
-#
-# create test-bed
-#
-let $per_table = `select @@innodb_file_per_table`;
-
-eval set global innodb_file_per_table = on;
-let $WL6501_TMP_DIR = `select @@tmpdir`;
-let $WL6501_DATA_DIR = `select @@datadir`;
-set innodb_strict_mode=off;
-
-#-----------------------------------------------------------------------------
-#
-# 1. Error in assigning undo logs for truncate action.
-#
---echo "1. Error in assigning undo logs for truncate action."
-eval set global innodb_file_per_table = $wl6501_file_per_table;
---disable_warnings
-eval create $wl6501_temp table t (
-        i int, f float, c char,
-        primary key pk(i), unique findex(f), index ck(c))
-        engine = innodb row_format = $wl6501_row_fmt
-        key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-#check table t;
-#
-set session debug = "+d,ib_err_trunc_assigning_undo_log";
---error ER_GET_ERRNO
-truncate table t;
-set session debug = "-d,ib_err_trunc_assigning_undo_log";
-#
-#check table t;
-select * from t;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 2. Error while preparing for truncate.
-#
---echo "2. Error while preparing for truncate."
-eval set global innodb_file_per_table = $wl6501_file_per_table;
---disable_warnings
-eval create $wl6501_temp table t (
-        i int, f float, c char,
-        primary key pk(i), unique findex(f), index ck(c))
-        engine = innodb row_format = $wl6501_row_fmt
-        key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-#check table t;
-#
-set session debug = "+d,ib_err_trunc_preparing_for_truncate";
---error ER_GET_ERRNO
-truncate table t;
-set session debug = "-d,ib_err_trunc_preparing_for_truncate";
-#
-#check table t;
-select * from t;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 3. Error while dropping/creating indexes
-#
---echo "3. Error while dropping/creating indexes"
-eval set global innodb_file_per_table = $wl6501_file_per_table;
---disable_warnings
-eval create $wl6501_temp table t (
-        i int, f float, c char,
-        primary key pk(i), unique findex(f), index ck(c))
-        engine = innodb row_format = $wl6501_row_fmt
-        key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-#check table t;
-#
-set session debug = "+d,ib_err_trunc_drop_index";
---error ER_GET_ERRNO
-truncate table t;
-set session debug = "-d,ib_err_trunc_drop_index";
-#
-#check table t;
---error ER_TABLE_CORRUPT, 1030
-select * from t;
-drop table t;
-#
-#
-eval set global innodb_file_per_table = $wl6501_file_per_table;
---disable_warnings
-eval create $wl6501_temp table t (
-        i int, f float, c char,
-        primary key pk(i), unique findex(f), index ck(c))
-        engine = innodb row_format = $wl6501_row_fmt
-        key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-#check table t;
-#
-set session debug = "+d,ib_err_trunc_create_index";
---error ER_GET_ERRNO
-truncate table t;
-set session debug = "-d,ib_err_trunc_create_index";
-#
-#check table t;
---error ER_TABLE_CORRUPT, 1030
-select * from t;
-drop table t;
-#
-#
-eval set global innodb_file_per_table = $wl6501_file_per_table;
---disable_warnings
-eval create temporary table t (
-        i int, f float, c char,
-        primary key pk(i), unique findex(f), index ck(c))
-        engine = innodb row_format = $wl6501_row_fmt
-        key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-#check table t;
-#
-set session debug = "+d,ib_err_trunc_temp_recreate_index";
---error ER_GET_ERRNO
-truncate table t;
-set session debug = "-d,ib_err_trunc_temp_recreate_index";
-#
-#check table t;
---error ER_TABLE_CORRUPT, 1030
-select * from t;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 4. Error while completing truncate of table involving FTS.
-#
---echo "4. Error while completing truncate of table involving FTS."
-eval set global innodb_file_per_table = $wl6501_file_per_table;
---disable_warnings
-eval create $wl6501_temp table t (i int, f float, c char(100),
-	primary key pk(i), index fk(f), fulltext index ck(c))
-	engine=innodb row_format=$wl6501_row_fmt
-	key_block_size=$wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'mysql is now oracle company'),
-		     (2, 2.2, 'innodb is part of mysql'),
-		     (3, 3.3, 'innodb is default storage engine of mysql');
-select * from t;
-#check table t;
-#
-set session debug = "+d,ib_err_trunc_during_fts_trunc";
---error ER_GET_ERRNO
-truncate table t;
-set session debug = "-d,ib_err_trunc_during_fts_trunc";
-#
-#check table t;
---error ER_TABLE_CORRUPT, 1030
-select * from t;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 5. Error while updating sys-tables.
-#
---echo "5. Error while updating sys-tables."
-eval set global innodb_file_per_table = $wl6501_file_per_table;
---disable_warnings
-eval create $wl6501_temp table t (i int, f float, c char(100),
-	primary key pk(i), index fk(f), fulltext index ck(c))
-	engine=innodb row_format=$wl6501_row_fmt
-	key_block_size=$wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'mysql is now oracle company'),
-		     (2, 2.2, 'innodb is part of mysql'),
-		     (3, 3.3, 'innodb is default storage engine of mysql');
-select * from t order by i;
-#check table t;
-#
-set session debug = "+d,ib_err_trunc_during_sys_table_update";
---error ER_GET_ERRNO
-truncate table t;
-set session debug = "-d,ib_err_trunc_during_sys_table_update";
-#
-#check table t;
---error ER_TABLE_CORRUPT, 1030
-select * from t order by i;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# remove test-bed
-#
-eval set global innodb_file_per_table = $per_table;
diff --git a/sql/item_func.cc b/sql/item_func.cc
index ac7ed75e7f9..93ddddfde61 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2724,7 +2724,7 @@ bool Item_func_min_max::get_date_native(MYSQL_TIME *ltime, ulonglong fuzzy_date)
     ltime->hour+= (ltime->month * 32 + ltime->day) * 24;
     ltime->year= ltime->month= ltime->day= 0;
     if (adjust_time_range_with_warn(ltime,
-                                    std::min<uint>(decimals, TIME_SECOND_PART_DIGITS)))
+                                    MY_MIN(decimals, TIME_SECOND_PART_DIGITS)))
       return (null_value= true);
   }
 
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 945224c2623..be9aefa7338 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -2531,7 +2531,7 @@ bool Item_sum_bit::remove_as_window(ulonglong value)
   }
 
   // Prevent overflow;
-  num_values_added = std::min(num_values_added, num_values_added - 1);
+  num_values_added = MY_MIN(num_values_added, num_values_added - 1);
   set_bits_from_counters();
   return 0;
 }
@@ -2544,7 +2544,7 @@ bool Item_sum_bit::add_as_window(ulonglong value)
     bit_counters[i]+= (value & (1ULL << i)) ? 1 : 0;
   }
   // Prevent overflow;
-  num_values_added = std::max(num_values_added, num_values_added + 1);
+  num_values_added = MY_MAX(num_values_added, num_values_added + 1);
   set_bits_from_counters();
   return 0;
 }
diff --git a/sql/key.cc b/sql/key.cc
index 3ee083e560f..ab93e8a0437 100644
--- a/sql/key.cc
+++ b/sql/key.cc
@@ -1,4 +1,5 @@
 /* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2018, MariaDB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,9 +22,6 @@
 #include "key.h"                                // key_rec_cmp
 #include "field.h"                              // Field
 
-using std::min;
-using std::max;
-
 /*
   Search after a key that starts with 'field'
 
@@ -135,7 +133,7 @@ void key_copy(uchar *to_key, const uchar *from_record, KEY *key_info,
           Don't copy data for null values
           The -1 below is to subtract the null byte which is already handled
         */
-        length= min<uint>(key_length, key_part->store_length-1);
+        length= MY_MIN(key_length, uint(key_part->store_length)-1);
         if (with_zerofill)
           bzero((char*) to_key, length);
         continue;
@@ -145,7 +143,7 @@ void key_copy(uchar *to_key, const uchar *from_record, KEY *key_info,
         key_part->key_part_flag & HA_VAR_LENGTH_PART)
     {
       key_length-= HA_KEY_BLOB_LENGTH;
-      length= min<uint>(key_length, key_part->length);
+      length= MY_MIN(key_length, key_part->length);
       uint bytes= key_part->field->get_key_image(to_key, length, Field::itRAW);
       if (with_zerofill && bytes < length)
         bzero((char*) to_key + bytes, length - bytes);
@@ -153,7 +151,7 @@ void key_copy(uchar *to_key, const uchar *from_record, KEY *key_info,
     }
     else
     {
-      length= min<uint>(key_length, key_part->length);
+      length= MY_MIN(key_length, key_part->length);
       Field *field= key_part->field;
       CHARSET_INFO *cs= field->charset();
       uint bytes= field->get_key_image(to_key, length, Field::itRAW);
@@ -205,7 +203,7 @@ void key_restore(uchar *to_record, const uchar *from_key, KEY *key_info,
           Don't copy data for null bytes
           The -1 below is to subtract the null byte which is already handled
         */
-        length= min<uint>(key_length, key_part->store_length-1);
+        length= MY_MIN(key_length, uint(key_part->store_length)-1);
         continue;
       }
     }
@@ -247,7 +245,7 @@ void key_restore(uchar *to_record, const uchar *from_key, KEY *key_info,
       my_ptrdiff_t ptrdiff= to_record - field->table->record[0];
       field->move_field_offset(ptrdiff);
       key_length-= HA_KEY_BLOB_LENGTH;
-      length= min<uint>(key_length, key_part->length);
+      length= MY_MIN(key_length, key_part->length);
       old_map= dbug_tmp_use_all_columns(field->table, field->table->write_set);
       field->set_key_image(from_key, length);
       dbug_tmp_restore_column_map(field->table->write_set, old_map);
@@ -256,7 +254,7 @@ void key_restore(uchar *to_record, const uchar *from_key, KEY *key_info,
     }
     else
     {
-      length= min<uint>(key_length, key_part->length);
+      length= MY_MIN(key_length, key_part->length);
       /* skip the byte with 'uneven' bits, if used */
       memcpy(to_record + key_part->offset, from_key + used_uneven_bits
              , (size_t) length - used_uneven_bits);
@@ -314,7 +312,7 @@ bool key_cmp_if_same(TABLE *table,const uchar *key,uint idx,uint key_length)
 	return 1;
       continue;
     }
-    length= min((uint) (key_end-key), store_length);
+    length= MY_MIN((uint) (key_end-key), store_length);
     if (!(key_part->key_type & (FIELDFLAG_NUMBER+FIELDFLAG_BINARY+
                                 FIELDFLAG_PACK)))
     {
@@ -392,7 +390,7 @@ void field_unpack(String *to, Field *field, const uchar *rec, uint max_length,
         tmp.length(charpos);
     }
     if (max_length < field->pack_length())
-      tmp.length(min(tmp.length(),max_length));
+      tmp.length(MY_MIN(tmp.length(),max_length));
     ErrConvString err(&tmp);
     to->append(err.ptr());
   }
diff --git a/sql/log.cc b/sql/log.cc
index 6923a6241cd..742b0a03e90 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -7108,7 +7108,7 @@ int MYSQL_BIN_LOG::write_cache(THD *thd, IO_CACHE *cache)
           int4store(ev + EVENT_LEN_OFFSET, ev_len + writer.checksum_len);
 
           writer.remains= ev_len;
-          if (writer.write(ev, std::min<uint>(ev_len, length - hdr_offs)))
+          if (writer.write(ev, MY_MIN(ev_len, length - hdr_offs)))
             DBUG_RETURN(ER_ERROR_ON_WRITE);
 
           /* next event header at ... */
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 0a46bf44d7b..0defb8fafd6 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -55,8 +55,6 @@
 
 #define my_b_write_string(A, B) my_b_write((A), (uchar*)(B), (uint) (sizeof(B) - 1))
 
-using std::max;
-
 /**
   BINLOG_CHECKSUM variable.
 */
@@ -1798,8 +1796,8 @@ int Log_event::read_log_event(IO_CACHE* file, String* packet,
   if (data_len < LOG_EVENT_MINIMAL_HEADER_LEN)
     DBUG_RETURN(LOG_READ_BOGUS);
 
-  if (data_len > max(max_allowed_packet,
-                     opt_binlog_rows_event_max_size + MAX_LOG_EVENT_HEADER))
+  if (data_len > MY_MAX(max_allowed_packet,
+                        opt_binlog_rows_event_max_size + MAX_LOG_EVENT_HEADER))
     DBUG_RETURN(LOG_READ_TOO_LARGE);
 
   if (likely(data_len > LOG_EVENT_MINIMAL_HEADER_LEN))
diff --git a/sql/mdl.h b/sql/mdl.h
index f30c976ac94..be9cc806ec2 100644
--- a/sql/mdl.h
+++ b/sql/mdl.h
@@ -21,8 +21,6 @@
 #include <mysql_com.h>
 #include <lf.h>
 
-#include <algorithm>
-
 class THD;
 
 class MDL_context;
@@ -373,8 +371,7 @@ public:
       character set is utf-8, we can safely assume that no
       character starts with a zero byte.
     */
-    using std::min;
-    return memcmp(m_ptr, rhs->m_ptr, min(m_length, rhs->m_length));
+    return memcmp(m_ptr, rhs->m_ptr, MY_MIN(m_length, rhs->m_length));
   }
 
   MDL_key(const MDL_key *rhs)
diff --git a/storage/innobase/btr/btr0cur.cc b/storage/innobase/btr/btr0cur.cc
index 43163058418..74940123d1a 100644
--- a/storage/innobase/btr/btr0cur.cc
+++ b/storage/innobase/btr/btr0cur.cc
@@ -3922,34 +3922,39 @@ btr_cur_update_in_place(
 	      || row_get_rec_trx_id(rec, index, offsets));
 
 #ifdef BTR_CUR_HASH_ADAPT
-	if (block->index) {
-		/* TO DO: Can we skip this if none of the fields
-		index->search_info->curr_n_fields
-		are being updated? */
-
-		/* The function row_upd_changes_ord_field_binary works only
-		if the update vector was built for a clustered index, we must
-		NOT call it if index is secondary */
+	{
+		rw_lock_t* ahi_latch = block->index
+			? btr_get_search_latch(block->index) : NULL;
+		if (ahi_latch) {
+			/* TO DO: Can we skip this if none of the fields
+			index->search_info->curr_n_fields
+			are being updated? */
+
+			/* The function row_upd_changes_ord_field_binary
+			does not work on a secondary index. */
+
+			if (!dict_index_is_clust(index)
+			    || row_upd_changes_ord_field_binary(
+				    index, update, thr, NULL, NULL)) {
+				ut_ad(!(update->info_bits
+					& REC_INFO_MIN_REC_FLAG));
+				/* Remove possible hash index pointer
+				to this record */
+				btr_search_update_hash_on_delete(cursor);
+			}
 
-		if (!dict_index_is_clust(index)
-		    || row_upd_changes_ord_field_binary(index, update, thr,
-							NULL, NULL)) {
-			ut_ad(!(update->info_bits & REC_INFO_MIN_REC_FLAG));
-			/* Remove possible hash index pointer to this record */
-			btr_search_update_hash_on_delete(cursor);
+			rw_lock_x_lock(ahi_latch);
 		}
 
-		btr_search_x_lock(index);
-	}
-
-	assert_block_ahi_valid(block);
+		assert_block_ahi_valid(block);
 #endif /* BTR_CUR_HASH_ADAPT */
 
-	row_upd_rec_in_place(rec, index, offsets, update, page_zip);
+		row_upd_rec_in_place(rec, index, offsets, update, page_zip);
 
 #ifdef BTR_CUR_HASH_ADAPT
-	if (block->index) {
-		btr_search_x_unlock(index);
+		if (ahi_latch) {
+			rw_lock_x_unlock(ahi_latch);
+		}
 	}
 #endif /* BTR_CUR_HASH_ADAPT */
 
diff --git a/storage/innobase/buf/buf0lru.cc b/storage/innobase/buf/buf0lru.cc
index 10ee106137d..2d68b8e9ccd 100644
--- a/storage/innobase/buf/buf0lru.cc
+++ b/storage/innobase/buf/buf0lru.cc
@@ -696,22 +696,26 @@ buf_flush_dirty_pages(
 /** Empty the flush list for all pages belonging to a tablespace.
 @param[in]	id		tablespace identifier
 @param[in]	observer	flush observer,
-				or NULL if nothing is to be written
-@param[in]	drop_ahi	whether to drop the adaptive hash index */
+				or NULL if nothing is to be written */
 void
 buf_LRU_flush_or_remove_pages(
 	ulint		id,
-	FlushObserver*	observer,
-	bool		drop_ahi)
+	FlushObserver*	observer
+#ifdef BTR_CUR_HASH_ADAPT
+	, bool drop_ahi /*!< whether to drop the adaptive hash index */
+#endif /* BTR_CUR_HASH_ADAPT */
+	)
 {
 	/* Pages in the system tablespace must never be discarded. */
 	ut_ad(id || observer);
 
 	for (ulint i = 0; i < srv_buf_pool_instances; i++) {
 		buf_pool_t* buf_pool = buf_pool_from_array(i);
+#ifdef BTR_CUR_HASH_ADAPT
 		if (drop_ahi) {
 			buf_LRU_drop_page_hash_for_tablespace(buf_pool, id);
 		}
+#endif /* BTR_CUR_HASH_ADAPT */
 		buf_flush_dirty_pages(buf_pool, id, observer);
 	}
 
diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc
index c28135b010a..86a50e70eb3 100644
--- a/storage/innobase/dict/dict0dict.cc
+++ b/storage/innobase/dict/dict0dict.cc
@@ -2,7 +2,7 @@
 
 Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2012, Facebook Inc.
-Copyright (c) 2013, 2017, MariaDB Corporation.
+Copyright (c) 2013, 2018, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -1630,7 +1630,11 @@ dict_table_rename_in_cache(
 			return(DB_OUT_OF_MEMORY);
 		}
 
-		fil_delete_tablespace(table->space, true);
+		fil_delete_tablespace(table->space
+#ifdef BTR_CUR_HASH_ADAPT
+				      , true
+#endif /* BTR_CUR_HASH_ADAPT */
+				      );
 
 		/* Delete any temp file hanging around. */
 		if (os_file_status(filepath, &exists, &ftype)
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
index fb199e05407..fa65bda4490 100644
--- a/storage/innobase/fil/fil0fil.cc
+++ b/storage/innobase/fil/fil0fil.cc
@@ -2977,10 +2977,14 @@ fil_table_accessible(const dict_table_t* table)
 
 /** Delete a tablespace and associated .ibd file.
 @param[in]	id		tablespace identifier
-@param[in]	drop_ahi	whether to drop the adaptive hash index
 @return	DB_SUCCESS or error */
 dberr_t
-fil_delete_tablespace(ulint id, bool drop_ahi)
+fil_delete_tablespace(
+	ulint id
+#ifdef BTR_CUR_HASH_ADAPT
+	, bool drop_ahi /*!< whether to drop the adaptive hash index */
+#endif /* BTR_CUR_HASH_ADAPT */
+	)
 {
 	char*		path = 0;
 	fil_space_t*	space = 0;
@@ -3023,7 +3027,11 @@ fil_delete_tablespace(ulint id, bool drop_ahi)
 	To deal with potential read requests, we will check the
 	::stop_new_ops flag in fil_io(). */
 
-	buf_LRU_flush_or_remove_pages(id, NULL, drop_ahi);
+	buf_LRU_flush_or_remove_pages(id, NULL
+#ifdef BTR_CUR_HASH_ADAPT
+				      , drop_ahi
+#endif /* BTR_CUR_HASH_ADAPT */
+				      );
 
 	/* If it is a delete then also delete any generated files, otherwise
 	when we drop the database the remove directory will fail. */
@@ -3303,7 +3311,11 @@ fil_discard_tablespace(
 {
 	dberr_t	err;
 
-	switch (err = fil_delete_tablespace(id, true)) {
+	switch (err = fil_delete_tablespace(id
+#ifdef BTR_CUR_HASH_ADAPT
+					    , true
+#endif /* BTR_CUR_HASH_ADAPT */
+					    )) {
 	case DB_SUCCESS:
 		break;
 
diff --git a/storage/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h
index 7b739fc0332..f6a7695a2b5 100644
--- a/storage/innobase/include/buf0lru.h
+++ b/storage/innobase/include/buf0lru.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2017, MariaDB Corporation.
+Copyright (c) 2017, 2018, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -53,13 +53,15 @@ These are low-level functions
 /** Empty the flush list for all pages belonging to a tablespace.
 @param[in]	id		tablespace identifier
 @param[in,out]	observer	flush observer,
-				or NULL if nothing is to be written
-@param[in]	drop_ahi	whether to drop the adaptive hash index */
+				or NULL if nothing is to be written */
 void
 buf_LRU_flush_or_remove_pages(
 	ulint		id,
-	FlushObserver*	observer,
-	bool		drop_ahi = false);
+	FlushObserver*	observer
+#ifdef BTR_CUR_HASH_ADAPT
+	, bool drop_ahi = false /*!< whether to drop the adaptive hash index */
+#endif /* BTR_CUR_HASH_ADAPT */
+	);
 
 #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
 /********************************************************************//**
diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
index febf47c1d08..724deb4e6bc 100644
--- a/storage/innobase/include/fil0fil.h
+++ b/storage/innobase/include/fil0fil.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2013, 2017, MariaDB Corporation.
+Copyright (c) 2013, 2018, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -946,10 +946,14 @@ fil_table_accessible(const dict_table_t* table)
 
 /** Delete a tablespace and associated .ibd file.
 @param[in]	id		tablespace identifier
-@param[in]	drop_ahi	whether to drop the adaptive hash index
 @return	DB_SUCCESS or error */
 dberr_t
-fil_delete_tablespace(ulint id, bool drop_ahi = false);
+fil_delete_tablespace(
+	ulint id
+#ifdef BTR_CUR_HASH_ADAPT
+	, bool drop_ahi = false /*!< whether to drop the adaptive hash index */
+#endif /* BTR_CUR_HASH_ADAPT */
+	);
 
 /** Truncate the tablespace to needed size.
 @param[in]	space_id	id of tablespace to truncate
diff --git a/storage/innobase/include/ha0ha.h b/storage/innobase/include/ha0ha.h
index ca4cb0a5f8f..f5be654f490 100644
--- a/storage/innobase/include/ha0ha.h
+++ b/storage/innobase/include/ha0ha.h
@@ -1,6 +1,7 @@
 /*****************************************************************************
 
 Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2018, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -210,7 +211,7 @@ struct ha_node_t {
 };
 #endif /* BTR_CUR_HASH_ADAPT */
 
-#ifdef UNIV_DEBUG
+#if defined UNIV_DEBUG && defined BTR_CUR_HASH_ADAPT
 /********************************************************************//**
 Assert that the synchronization object in a hash operation involving
 possible change in the hash table is held.
diff --git a/storage/perfschema/pfs.cc b/storage/perfschema/pfs.cc
index a690bdf911d..fd415d8bc21 100644
--- a/storage/perfschema/pfs.cc
+++ b/storage/perfschema/pfs.cc
@@ -41,7 +41,6 @@
 #include "sp_head.h"
 #include "pfs_digest.h"
 
-using std::min;
 /**
   @page PAGE_PERFORMANCE_SCHEMA The Performance Schema main page
   MySQL PERFORMANCE_SCHEMA implementation.
@@ -2022,7 +2021,7 @@ static void set_thread_account_v1(const char *user, int user_len,
   DBUG_ASSERT((host != NULL) || (host_len == 0));
   DBUG_ASSERT(host_len >= 0);
 
-  host_len= min<size_t>(host_len, sizeof(pfs->m_hostname));
+  host_len= MY_MIN(host_len, static_cast<int>(sizeof(pfs->m_hostname)));
 
   if (unlikely(pfs == NULL))
     return;
diff --git a/storage/perfschema/table_threads.cc b/storage/perfschema/table_threads.cc
index 7be51b2bb20..1458c0b11d5 100644
--- a/storage/perfschema/table_threads.cc
+++ b/storage/perfschema/table_threads.cc
@@ -257,8 +257,8 @@ int table_threads::read_row_values(TABLE *table,
              changed to less than or equal to 64 characters.
            */
           set_field_varchar_utf8(f, m_row.m_processlist_state_ptr,
-                                 std::min<uint>(m_row.m_processlist_state_length,
-                                                f->char_length()));
+                                 MY_MIN(m_row.m_processlist_state_length,
+                                        f->char_length()));
         }
         else
           f->set_null();
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_triggers.result b/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_triggers.result
index 1d3cd7db641..69acc4a92e8 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_triggers.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_triggers.result
@@ -1,12 +1,12 @@
 include/master-slave.inc
-Warnings:
-Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 # Test of row replication with triggers on the slave side
+connection master;
 CREATE TABLE t1 (C1 CHAR(1) primary key, C2 CHAR(1));
 SELECT * FROM t1;
 C1	C2
+connection slave;
+connection slave;
 SET @old_slave_exec_mode= @@global.slave_exec_mode;
 SET @old_slave_run_triggers_for_rbr= @@global.slave_run_triggers_for_rbr;
 SET @@global.slave_exec_mode= IDEMPOTENT;
@@ -38,8 +38,11 @@ i0	0
 i1	0		
 u0	0		
 u1	0		
+connection master;
 # INSERT triggers test
 insert into t1 values ('a','b');
+connection slave;
+connection slave;
 SELECT * FROM t2 order by id;
 id	cnt	o	n
 d0	0		
@@ -48,8 +51,11 @@ i0	1		a
 i1	1		a
 u0	0		
 u1	0		
+connection master;
 # UPDATE triggers test
 update t1 set C1= 'd';
+connection slave;
+connection slave;
 SELECT * FROM t2 order by id;
 id	cnt	o	n
 d0	0		
@@ -58,8 +64,11 @@ i0	1		a
 i1	1		a
 u0	1	a	d
 u1	1	a	d
+connection master;
 # DELETE triggers test
 delete from t1 where C1='d';
+connection slave;
+connection slave;
 SELECT * FROM t2 order by id;
 id	cnt	o	n
 d0	1	d	
@@ -78,7 +87,10 @@ i0	2		0
 i1	2		0
 u0	1	a	d
 u1	1	a	d
+connection master;
 insert into t1 values ('0','1');
+connection slave;
+connection slave;
 SELECT * FROM t2 order by id;
 id	cnt	o	n
 d0	1	d	
@@ -90,32 +102,44 @@ u1	2	0	0
 # INSERT triggers which cause also DELETE test
 # (insert duplicate row in table referenced by foreign key)
 insert into t1 values ('1','1');
+connection master;
 drop table if exists t1;
+connection slave;
+connection slave;
 SET @@global.slave_exec_mode= @old_slave_exec_mode;
 SET @@global.slave_run_triggers_for_rbr= @old_slave_run_triggers_for_rbr;
 drop table t2;
+connection master;
 CREATE TABLE t1 (i INT);
 CREATE TABLE t2 (i INT);
+connection slave;
 SET @old_slave_run_triggers_for_rbr= @@global.slave_run_triggers_for_rbr;
 SET GLOBAL slave_run_triggers_for_rbr=YES;
 CREATE TRIGGER tr AFTER INSERT ON t1 FOR EACH ROW
 INSERT INTO t2 VALUES (new.i);
+connection master;
 BEGIN;
 INSERT INTO t1 VALUES (1);
 INSERT INTO t1 VALUES (2);
 COMMIT;
+connection slave;
 select * from t2;
 i
 1
 2
 SET @@global.slave_run_triggers_for_rbr= @old_slave_run_triggers_for_rbr;
+connection master;
 drop tables t2,t1;
+connection slave;
 # Triggers on slave do not work if master has some
+connection master;
 CREATE TABLE t1 (C1 CHAR(1) primary key, C2 CHAR(1));
 SELECT * FROM t1;
 C1	C2
 create trigger t1_dummy before delete on t1 for each row
 set @dummy= 1;
+connection slave;
+connection slave;
 SET @old_slave_exec_mode= @@global.slave_exec_mode;
 SET @old_slave_run_triggers_for_rbr= @@global.slave_run_triggers_for_rbr;
 SET @@global.slave_exec_mode= IDEMPOTENT;
@@ -145,8 +169,11 @@ i0	0
 i1	0		
 u0	0		
 u1	0		
+connection master;
 # INSERT triggers test
 insert into t1 values ('a','b');
+connection slave;
+connection slave;
 SELECT * FROM t2 order by id;
 id	cnt	o	n
 d0	0		
@@ -155,8 +182,11 @@ i0	0
 i1	0		
 u0	0		
 u1	0		
+connection master;
 # UPDATE triggers test
 update t1 set C1= 'd';
+connection slave;
+connection slave;
 SELECT * FROM t2 order by id;
 id	cnt	o	n
 d0	0		
@@ -165,8 +195,11 @@ i0	0
 i1	0		
 u0	0		
 u1	0		
+connection master;
 # DELETE triggers test
 delete from t1 where C1='d';
+connection slave;
+connection slave;
 SELECT * FROM t2 order by id;
 id	cnt	o	n
 d0	0		
@@ -185,7 +218,10 @@ i0	1		0
 i1	1		0
 u0	0		
 u1	0		
+connection master;
 insert into t1 values ('0','1');
+connection slave;
+connection slave;
 SELECT * FROM t2 order by id;
 id	cnt	o	n
 d0	0		
@@ -197,22 +233,30 @@ u1	0
 # INSERT triggers which cause also DELETE test
 # (insert duplicate row in table referenced by foreign key)
 insert into t1 values ('1','1');
+connection master;
 drop table if exists t1;
+connection slave;
+connection slave;
 SET @@global.slave_exec_mode= @old_slave_exec_mode;
 SET @@global.slave_run_triggers_for_rbr= @old_slave_run_triggers_for_rbr;
 drop table t2;
 #
 # MDEV-5513: Trigger is applied to the rows after first one
 #
+connection master;
 create table t1 (a int, b int);
 create table tlog (a int auto_increment primary key);
 set sql_log_bin=0;
 create trigger tr1 after insert on t1 for each row insert into tlog values (null);
 set sql_log_bin=1;
+connection slave;
+connection slave;
 set @slave_run_triggers_for_rbr.saved = @@slave_run_triggers_for_rbr;
 set global slave_run_triggers_for_rbr=1;
 create trigger tr2 before insert on t1 for each row set new.b = new.a;
+connection master;
 insert into t1 values (1,10),(2,20),(3,30);
+connection slave;
 select * from t1;
 a	b
 1	10