Skip to content

Commit

Permalink
Merge branch '5.5' into 10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@cvicentiu
cvicentiu committed May 11, 2019
2 parents c0ac0b8 + 5543b75 commit cb248f8
Show file tree
Hide file tree
Showing 2,967 changed files with 3,001 additions and 3,001 deletions.
2 changes: 1 addition & 1 deletion BUILD/FINISH.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# You should have received a copy of the GNU Library General Public
# License along with this library; if not, write to the Free
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
# MA 02110-1301, USA
# MA 02110-1335 USA

cflags="$c_warnings $extra_flags $EXTRA_FLAGS $EXTRA_CFLAGS"
cxxflags="$cxx_warnings $base_cxxflags $extra_flags $EXTRA_FLAGS $EXTRA_CXXFLAGS"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/SETUP.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# You should have received a copy of the GNU Library General Public
# License along with this library; if not, write to the Free
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301, USA
# MA 02110-1335 USA

########################################################################

Expand Down
2 changes: 1 addition & 1 deletion BUILD/autorun.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# You should have received a copy of the GNU Library General Public
# License along with this library; if not, write to the Free
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
# MA 02110-1301, USA
# MA 02110-1335 USA

# Create MySQL cmake configure wrapper

Expand Down
2 changes: 1 addition & 1 deletion BUILD/check-cpu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA

#
# Check cpu of current machine and find the
Expand Down
2 changes: 1 addition & 1 deletion BUILD/cleanup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/cmake_configure.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# You should have received a copy of the GNU Library General Public
# License along with this library; if not, write to the Free
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
# MA 02110-1301, USA
# MA 02110-1335 USA

# Ensure cmake and perl are there
cmake -P cmake/check_minimal_version.cmake >/dev/null 2>&1 || HAVE_CMAKE=no
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-alpha
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-amd64-debug-max
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-amd64-debug-max-no-ndb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# You should have received a copy of the GNU Library General Public
# License along with this library; if not, write to the Free
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301, USA
# MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-amd64-gcov
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-amd64-gprof
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-amd64-max
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-amd64-valgrind-max
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# You should have received a copy of the GNU Library General Public
# License along with this library; if not, write to the Free
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301, USA
# MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-darwin-mwcc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA

#
# This script's purpose is to update the automake/autoconf helper scripts and
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-hpux11-parisc2-aCC
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

if [ ! -f "sql/mysqld.cc" ]; then
echo "You must run this script from the MySQL top-level directory."
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-ia64-debug-max
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA

gmake -k maintainer-clean || true
/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-innodb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License along with
# this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St,
# Fifth Floor, Boston, MA 02110-1301 USA
# Fifth Floor, Boston, MA 02110-1335 USA
#

# we assume this script is in storage/innobase/
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-irix-mips64-mipspro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

if [ ! -f "sql/mysqld.cc" ]; then
echo "You must run this script from the MySQL top-level directory."
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium-cybozu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium-debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium-debug-max
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium-debug-max-no-embedded
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium-debug-max-no-ndb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium-debug-openssl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium-debug-yassl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium-gcov
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

# Need to disable ccache, or we loose the gcov-needed compiler output files.

Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium-gprof
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium-icc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
4 changes: 2 additions & 2 deletions BUILD/compile-pentium-icc-valgrind-max
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA

# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
#
Expand All @@ -27,7 +27,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium-icc-yassl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium-max
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium-myodbc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
4 changes: 2 additions & 2 deletions BUILD/compile-pentium-valgrind-max
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA

# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
#
Expand All @@ -27,7 +27,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium-valgrind-max-no-ndb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# You should have received a copy of the GNU Library General Public
# License along with this library; if not, write to the Free
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301, USA
# MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium64-debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium64-debug-max
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium64-gcov
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium64-gprof
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium64-max
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# You should have received a copy of the GNU Library General Public
# License along with this library; if not, write to the Free
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301, USA
# MA 02110-1335 USA

path=`dirname $0`
. "$path/SETUP.sh"
Expand Down

0 comments on commit cb248f8

Please sign in to comment.