Merge tag 'clone-5.7.29-build' into mysql-5.7-cluster-7.5

Change-Id: I1f088da44c4a67d46e00f04f2bdbc4e1a92dde78

Author: arnabray21

LICENSE

@@ -588,7 +588,6 @@ PSF LICENSE AGREEMENT FOR PYTHON 2.7.11
 8. By copying, installing or otherwise using Python 2.7.11, Licensee agrees
    to be bound by the terms and conditions of this License Agreement.
 
-
 Boost Library
 
    The following software may be included in this product:
@@ -1014,71 +1013,6 @@ OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
 ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
-   Some files are:
-Copyright (c) 1998 The NetBSD Foundation, Inc.
-All rights reserved.
-
-This code is derived from software contributed to The NetBSD
-Foundation by Christos Zoulas.
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the following
-conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above
-   copyright notice, this list of conditions and the following
-   disclaimer in the documentation and/or other materials provided
-   with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-   Some files are:
-Copyright (c) 2009 The NetBSD Foundation, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the
-   distribution.
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgement:
-       This product includes software developed by the NetBSD
-       Foundation, Inc. and its contributors.
-4. Neither the name of The NetBSD Foundation nor the names of its
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 Facebook Fast Checksum Patch
 
    The following software may be included in this product:
@@ -1968,7 +1902,6 @@ SUCH DAMAGE.
 libevent
 
    The following software may be included in this product:
-
 Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
 Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
 
@@ -2036,7 +1969,6 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-
 libgcc & libstdc++ Libraries
 
    The following software may be included in this product:
@@ -3904,32 +3836,30 @@ LZ4
 
    The following software may be included in this product:
 LZ4 Library
-Copyright (c) 2011-2014, Yann Collet
+Copyright (c) 2011-2016, Yann Collet
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+modification, are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
 
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAG
+ES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 md5 (Message-Digest Algorithm 5)
 
@@ -4688,16 +4618,14 @@ OpenSSL License
 
   The OpenSSL toolkit stays under a double license, i.e. both the conditions of
   the OpenSSL License and the original SSLeay license apply to the toolkit.
-  See below for the actual license texts. Actually both licenses are BSD-style
-  Open Source licenses. In case of any license issues related to OpenSSL
-  please contact openssl-core@openssl.org.
+  See below for the actual license texts.
 
   OpenSSL License
   ---------------
 
 /* ====================================================================
 
- * Copyright (c) 1998-2017 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2019 The OpenSSL Project.  All rights reserved.
  *
 
  * Redistribution and use in source and binary forms, with or without

README

@@ -1,4 +1,4 @@
-Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
 
 This is a release of MySQL, an SQL database server.
 

VERSION

@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=7
-MYSQL_VERSION_PATCH=28
+MYSQL_VERSION_PATCH=29
 MYSQL_VERSION_EXTRA=-ndb-7.5.17

client/dump/mysql_crawler.cc

@@ -277,13 +277,6 @@ void Mysql_crawler::enumerate_views(const Database& db)
       const Mysql::Tools::Base::Mysql_query_runner::Row& is_view= **view_it;
       if (is_view[0] == "1")
       {
-        /* Check if view dependent objects exists */
-        if (runner->run_query(std::string("LOCK TABLES ")
-              + this->get_quoted_object_full_name(db.get_name(), table_name)
-              + " READ") != 0)
-          return;
-        else
-          runner->run_query(std::string("UNLOCK TABLES"));
         View* view= new View(this->generate_new_object_id(),
                               table_name,
                               db.get_name(),

client/dump/mysqldump_tool_chain_maker.cc

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2019 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, version 2.0,
@@ -31,6 +31,8 @@
 #include "sql_formatter.h"
 #include "mysqldump_tool_chain_maker_options.h"
 #include <boost/algorithm/string.hpp>
+#include "view.h"
+#include "m_ctype.h"
 
 using namespace Mysql::Tools::Dump;
 
@@ -52,12 +54,35 @@ I_object_reader* Mysqldump_tool_chain_maker::create_chain(
   {
     return NULL;
   }
-  if (!m_options->is_object_included_in_dump(
-    dynamic_cast<Abstract_data_object*>(
-    dump_task->get_related_db_object())))
+
+  Abstract_data_object* object= dynamic_cast<Abstract_data_object*>(
+    dump_task->get_related_db_object());
+  if (!m_options->is_object_included_in_dump(object))
   {
     return NULL;
   }
+  /*
+    View dependency check is moved post filteration. This will ensure that
+    only filtered out views will be checked for their dependecies. This
+    allows mysqlpump to dump a database even when there exsits an invalid
+    view in another database which user is not interested to dump. I_S views
+    are skipped from this check.
+  */
+  if (object && (dynamic_cast<View*>(object) != NULL) &&
+      my_strcasecmp(&my_charset_latin1, object->get_schema().c_str(),
+                    INFORMATION_SCHEMA_DB_NAME))
+  {
+     Mysql::Tools::Base::Mysql_query_runner* runner= this->get_runner();
+     /* Check if view dependent objects exists */
+     if (runner->run_query(std::string("LOCK TABLES ")
+           + this->get_quoted_object_full_name(object->get_schema(),
+             object->get_name()) + " READ") != 0)
+       return NULL;
+     else
+       runner->run_query(std::string("UNLOCK TABLES"));
+     delete runner;
+  }
+
   if (m_main_object_reader == NULL)
   {
     I_output_writer* writer;

include/mysql_com.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2019, 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, version 2.0,
@@ -620,6 +620,7 @@ ulong STDCALL net_field_length_checked(uchar **packet, ulong max_length);
 my_ulonglong net_field_length_ll(uchar **packet);
 uchar *net_store_length(uchar *pkg, ulonglong length);
 unsigned int net_length_size(ulonglong num);
+unsigned int net_field_length_size(const unsigned char *pos);
 #endif
 
 #ifdef __cplusplus

include/welcome_copyright_notice.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2019, 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, version 2.0,
@@ -23,7 +23,7 @@
 #ifndef _welcome_copyright_notice_h_
 #define _welcome_copyright_notice_h_
 
-#define COPYRIGHT_NOTICE_CURRENT_YEAR "2019"
+#define COPYRIGHT_NOTICE_CURRENT_YEAR "2020"
 
 /*
   This define specifies copyright notice which is displayed by every MySQL

mysql-test/include/escape_sql.inc

@@ -0,0 +1,60 @@
+# ==== Purpose ====
+#
+# Escape occurences of " or ' in a string, in order to be used inside
+# an SQL statement.
+#
+# ==== Usage ====
+#
+# --let $escape_string= String
+# [--let $enclosing_char= "|' (default is ")]
+# --source include/escape_sql.inc
+# --echo $escape_string
+#
+# Parameters:
+#   $escape_string
+#     String to search for occurences of the $enclosing_char and
+#     escape them according to SQL syntax. It is also the output
+#     parameter.
+
+#   $enclosing_char
+#     The character that will be used to enclose $escape_string when
+#     included in an SQL statement.
+#
+
+if (!$escape_string)
+{
+  --die Error: set $escape_string before sourcing escape_sql.inc
+}
+
+if ($escape_string != '')
+{
+  --let $_enclosing_char= "
+  if ($enclosing_char)
+  {
+    --let $_enclosing_char= $enclosing_char
+  }
+
+
+  --let $_output_filename= `SELECT UUID()`
+  --let $_output_filename= $MYSQLTEST_VARDIR/tmp/$_output_filename
+  --let full_output_filename= $_output_filename
+  --let to_replace= $escape_string
+  --let used_quote= $_enclosing_char
+
+  perl;
+    my $out= $ENV{'full_output_filename'};
+    my $to_replace= $ENV{'to_replace'};
+    my $quote= $ENV{'used_quote'};
+
+    $to_replace =~ s/$quote/$quote$quote/g;
+
+    open(FILE, ">", $out) or die "Error $? opening $output_filename: $!";
+    print FILE $to_replace or die "Error $? writing to $output_filename: $!";
+    close FILE or die "Error $? closing $output_filename: $!";
+    chmod 0777, $out;
+  EOF
+
+  --let $escape_string= `SELECT LOAD_FILE('$_output_filename')`
+}
+# Cleanup
+--remove_file $_output_filename

mysql-test/include/have_slave_repository_type_table.inc

@@ -0,0 +1,7 @@
+--let $mi_repo= `SELECT @@GLOBAL.master_info_repository='FILE'`
+--let $rli_repo= `SELECT @@GLOBAL.relay_log_info_repository='FILE'`
+
+if (`SELECT $mi_repo = 1 OR $rli_repo = 1`)
+{
+  --skip Test runs only when slave repository type = TABLE
+}

mysql-test/include/read_only_bug28438114.inc

@@ -0,0 +1,36 @@
+#
+# Test that $query correctly checks read_only flag even if this
+# flag is set while the query is blocked waiting for protection
+# global read lock. Used by test for bug#28438114 in read_only.test.
+#
+
+--enable_connect_log
+connection default;
+FLUSH TABLES WITH READ LOCK;
+
+connection con1;
+--echo # DDL statement will block waiting for GRL.
+--send_eval $query
+
+connection con2;
+--echo # Wait until statement is blocked waiting for GRL.
+let $wait_condition=
+  SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST
+  WHERE STATE = "Waiting for global read lock";
+--source include/wait_condition.inc
+SET GLOBAL READ_ONLY= 1;
+
+connection default;
+--echo # Unblock the DDL statement.
+UNLOCK TABLES;
+
+connection con1;
+--echo # Without patch for BUG#28438114, the DDL statement will succeed even
+--echo # though read only mode was set.
+--error ER_OPTION_PREVENTS_STATEMENT
+--reap
+
+--echo # Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+--disable_connect_log

mysql-test/include/show_slave_status.inc

@@ -100,6 +100,15 @@ while ($_show_slave_status_items)
   --let $_show_slave_status_items= `SELECT LTRIM(SUBSTRING('$_show_slave_status_items', LENGTH('$_show_slave_status_name') + 2))`
 
   --let $_show_slave_status_value= query_get_value($show_slave_status_cmd, $_show_slave_status_name, 1)
+
+  if ($_show_slave_status_value)
+  {
+      --let $escape_string= $_show_slave_status_value
+      --let $enclosing_char= "
+      --source include/escape_sql.inc
+      --let $_show_slave_status_value= $escape_string
+  }
+
   --let $_slave_field_result_replace= /[\\]/\// $slave_field_result_replace
   --replace_regex $_slave_field_result_replace
   --let $_show_slave_status_value= `SELECT REPLACE("$_show_slave_status_value", '$MYSQL_TEST_DIR', 'MYSQL_TEST_DIR')`