Merge tag 'clone-5.6.43-build' into mysql-5.6-cluster-7.3

Change-Id: Ia5b5e5eb821099ee108bc3bba7c2d99494a44417

Author: arnabray21

VERSION

@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=6
-MYSQL_VERSION_PATCH=42
+MYSQL_VERSION_PATCH=43
 MYSQL_VERSION_EXTRA=-ndb-7.3.24

client/sql_string.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
 
    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
@@ -26,6 +26,7 @@
 #include "sql_string.h"
 
 #include <algorithm>
+#include <limits>
 
 using std::min;
 using std::max;
@@ -74,6 +75,11 @@ bool String::realloc(uint32 alloc_length, bool force_on_heap)
 
   if (Alloced_length < len)
   {
+    // Signal an error if len exceeds uint32 max on 64-bit word platform.
+#if defined(__WORDSIZE) && (__WORDSIZE == 64)
+    if (len > std::numeric_limits<uint32>::max())
+      return TRUE;
+#endif
     char *new_ptr;
     if (alloced)
     {

mysql-test/r/mysqld--help-win.result

@@ -500,6 +500,9 @@ The following options may be given as the first argument:
  NULLS_EQUAL (emulate 4.0 behavior), and NULLS_IGNORED
  --myisam-use-mmap   Use memory mapping for reading and writing MyISAM tables
  --named-pipe        Enable the named pipe (NT)
+ --named-pipe-full-access-group=name 
+ Name of Windows group granted full access to the named
+ pipe
  --net-buffer-length=# 
  Buffer length for TCP/IP and socket communication
  --net-read-timeout=# 
@@ -1198,6 +1201,7 @@ myisam-sort-buffer-size 8388608
 myisam-stats-method nulls_unequal
 myisam-use-mmap FALSE
 named-pipe FALSE
+named-pipe-full-access-group everyone
 net-buffer-length 16384
 net-read-timeout 30
 net-retry-count 10

mysql-test/suite/binlog/r/binlog_index.result

@@ -383,6 +383,17 @@ master-bin.000020	#
 master-bin.000021	#
 master-bin.000022	#
 DROP TABLE t1;
+SET SESSION debug="";
 # Test case11: Ends
+# Test case12: Bug#25839610 ABORT OCCUR DURING SLAVE BACKUP
+#              WHEN RELAY LOG INDEX IS LOCK
+# This test verifies that serveral retries are performed
+# if there is a failure while deleting/renaming index files.
+SET SESSION debug="+d,simulate_index_file_delete_failure";
+SET SESSION debug="+d,simulate_crash_safe_index_file_rename_failure";
+FLUSH LOGS;
+include/assert_grep.inc [Retried for delete.]
+include/assert_grep.inc [Retried for rename.]
 SET SESSION debug="";
+# Test case12: Ends
 End of tests

mysql-test/suite/binlog/t/binlog_index.test

@@ -471,7 +471,37 @@ SHOW BINARY LOGS;
 --source include/restart_mysqld.inc
 -- source include/show_binary_logs.inc
 DROP TABLE t1;
+eval SET SESSION debug="$old";
 -- echo # Test case11: Ends
 
+
+--echo # Test case12: Bug#25839610 ABORT OCCUR DURING SLAVE BACKUP
+--echo #              WHEN RELAY LOG INDEX IS LOCK
+--echo # This test verifies that serveral retries are performed
+--echo # if there is a failure while deleting/renaming index files.
+
+--disable_warnings
+SET SESSION debug="+d,simulate_index_file_delete_failure";
+SET SESSION debug="+d,simulate_crash_safe_index_file_rename_failure";
+FLUSH LOGS;
+
+# Check that delete retry is present in the error log
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.1.err
+--let $assert_only_after = CURRENT_TEST: binlog.binlog_index
+--let $assert_count = 5
+--let $assert_select = Retrying delete
+--let $assert_text = Retried for delete.
+--source include/assert_grep.inc
+
+# Check that rename retry is present in the error log
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.1.err
+--let $assert_only_after = CURRENT_TEST: binlog.binlog_index
+--let $assert_count = 5
+--let $assert_select = Retrying rename
+--let $assert_text = Retried for rename.
+--source include/assert_grep.inc
+--enable_warnings
 eval SET SESSION debug="$old";
+--echo # Test case12: Ends
+
 --echo End of tests

mysql-test/suite/perfschema/r/dml_setup_instruments.result

@@ -16,7 +16,9 @@ wait/synch/mutex/sql/LOCK_crypt	YES	YES
 wait/synch/mutex/sql/LOCK_delayed_create	YES	YES
 select * from performance_schema.setup_instruments
 where name like 'Wait/Synch/Rwlock/sql/%'
-  and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock')
+  and name not in (
+'wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock',
+'wait/synch/rwlock/sql/LOCK_named_pipe_full_access_group')
 order by name limit 10;
 NAME	ENABLED	TIMED
 wait/synch/rwlock/sql/Binlog_relay_IO_delegate::lock	YES	YES

mysql-test/suite/perfschema/t/dml_setup_instruments.test

@@ -22,10 +22,13 @@ select * from performance_schema.setup_instruments
   order by name limit 10;
 
 # CRYPTO_dynlock_value::lock is dependent on the build (SSL)
+# LOCK_named_pipe_full_access_group is dependent on the build (Windows)
 
 select * from performance_schema.setup_instruments
   where name like 'Wait/Synch/Rwlock/sql/%'
-  and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock')
+  and name not in (
+  'wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock',
+  'wait/synch/rwlock/sql/LOCK_named_pipe_full_access_group')
   order by name limit 10;
 
 # COND_handler_count is dependent on the build (Windows only)

mysql-test/suite/rpl/r/rpl_relay_log_space_synchronization.result

@@ -0,0 +1,23 @@
+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]
+CREATE TABLE t1 (i INT);
+include/sync_slave_sql_with_master.inc
+include/stop_slave_sql.inc
+SET GLOBAL debug='+d,wait_in_purge_index_entry';
+FLUSH LOCAL RELAY LOGS;
+START SLAVE SQL_THREAD;
+SET DEBUG_SYNC="now WAIT_FOR in_purge_index_entry";
+[connection master]
+INSERT INTO t1 VALUES (1);
+[connection slave]
+include/assert.inc [IO Thread is waiting for Relay_log_info::log_space_lock.]
+SET DEBUG_SYNC="now SIGNAL go_ahead_sql";
+[connection master]
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+SET GLOBAL debug='-d,wait_in_purge_index_entry';
+SET DEBUG_SYNC="RESET";
+include/rpl_end.inc

mysql-test/suite/rpl/t/rpl_relay_log_space_synchronization.test

@@ -0,0 +1,64 @@
+# === Purpose ===
+#
+# This test verifies that SQL and IO threads update the
+# rli->relay_log_space_total variable in a synchronized manner.
+#
+# === Implementation ===
+#
+# 1. On Slave, make the SQL thread to purge relay logs and halt
+#    the SQL thread in MYSQL_BIN_LOG::purge_index_entry function
+#    using debug sync utility.
+# 2. Do a DML on master so that IO thread calls queue_event and
+#    updates rli->relay_log_space_total.
+# 3. Verify that IO thread is waiting rli->log_space_lock until it is released
+#    by SQL thread.
+#
+# === References ===
+#
+# Bug#26997096 RELAY_LOG_SPACE IS INACCURATE AND LEAKS
+
+# This test case is binlog_format agnostic
+--source include/have_binlog_format_row.inc
+# This test case uses debug_sync
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--source include/master-slave.inc
+
+CREATE TABLE t1 (i INT);
+
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave_sql.inc
+SET GLOBAL debug='+d,wait_in_purge_index_entry';
+
+# Create a new relay log so the START SLAVE SQL_THREAD tries
+# to purge the old relay logs and hits the debug point.
+FLUSH LOCAL RELAY LOGS;
+START SLAVE SQL_THREAD;
+SET DEBUG_SYNC="now WAIT_FOR in_purge_index_entry";
+
+# Do a DML on master so that IO thread calls queue_event and
+# updates rli->relay_log_space_total.
+--source include/rpl_connection_master.inc
+INSERT INTO t1 VALUES (1);
+--source include/rpl_connection_slave.inc
+
+# Wait until IO thread tries to take a log_space_lock.
+--let $io_thread_id = `SELECT THREAD_ID FROM performance_schema.threads WHERE NAME like '%slave_io%'`
+--let $wait_condition= SELECT EVENT_NAME= 'wait/synch/mutex/sql/Relay_log_info::log_space_lock' FROM performance_schema.events_waits_current WHERE THREAD_ID=$io_thread_id
+--source include/wait_condition.inc
+
+# Since SQL thread has taken the rli->log_space_lock, IO thread should wait until
+# the lock is released. Assert that IO thread is waiting for rli->log_space_lock.
+--let $assert_text= IO Thread is waiting for Relay_log_info::log_space_lock.
+--let $assert_cond= "[SELECT EVENT_NAME FROM performance_schema.events_waits_current WHERE THREAD_ID=$io_thread_id]" = "wait/synch/mutex/sql/Relay_log_info::log_space_lock"
+--source include/assert.inc
+
+SET DEBUG_SYNC="now SIGNAL go_ahead_sql";
+
+# Cleanup
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+--source include/sync_slave_sql_with_master.inc
+SET GLOBAL debug='-d,wait_in_purge_index_entry';
+SET DEBUG_SYNC="RESET";
+--source include/rpl_end.inc

mysql-test/suite/sys_vars/r/named_pipe_full_access_group_basic.result

@@ -0,0 +1,17 @@
+select @@global.named_pipe_full_access_group;
+@@global.named_pipe_full_access_group
+everyone
+select @@session.named_pipe_full_access_group;
+ERROR HY000: Variable 'named_pipe_full_access_group' is a GLOBAL variable
+show global variables like 'named_pipe_full_access_group';
+Variable_name	Value
+named_pipe_full_access_group	everyone
+show session variables like 'named_pipe_full_access_group';
+Variable_name	Value
+named_pipe_full_access_group	everyone
+select * from information_schema.global_variables where variable_name='named_pipe_full_access_group';
+VARIABLE_NAME	VARIABLE_VALUE
+NAMED_PIPE_FULL_ACCESS_GROUP	everyone
+select * from information_schema.session_variables where variable_name='named_pipe_full_access_group';
+VARIABLE_NAME	VARIABLE_VALUE
+NAMED_PIPE_FULL_ACCESS_GROUP	everyone