Skip to content

Commit

Permalink
Merge pull request percona#3476 from inikep/ps-merge-5.7.28-part1
Browse files Browse the repository at this point in the history 
PS-5859: Merge MySQL 5.7.28 (part 1)
  • Loading branch information
@inikep
inikep authored Nov 1, 2019
2 parents 1a31abc + 21f8dcb commit b90d9b1
Show file tree
Hide file tree
Showing 6,347 changed files with 82,248 additions and 71,703 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
49 changes: 0 additions & 49 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,55 +547,6 @@ extra/resolve_stack_dump
extra/resolveip
extra/sql_state.h
extra/tztime.cc
extra/yassl/src/.deps/buffer.Plo
extra/yassl/src/.deps/cert_wrapper.Plo
extra/yassl/src/.deps/crypto_wrapper.Plo
extra/yassl/src/.deps/handshake.Plo
extra/yassl/src/.deps/lock.Plo
extra/yassl/src/.deps/log.Plo
extra/yassl/src/.deps/socket_wrapper.Plo
extra/yassl/src/.deps/ssl.Plo
extra/yassl/src/.deps/template_instnt.Plo
extra/yassl/src/.deps/timer.Plo
extra/yassl/src/.deps/yassl_error.Plo
extra/yassl/src/.deps/yassl_imp.Plo
extra/yassl/src/.deps/yassl_int.Plo
extra/yassl/taocrypt/benchmark/.deps/benchmark-benchmark.Po
extra/yassl/taocrypt/benchmark/benchmark
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aes.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aestables.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-algebra.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-arc4.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-asn.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-bftables.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-blowfish.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-coding.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-des.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dh.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dsa.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-file.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-hash.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-integer.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md2.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md4.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md5.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-misc.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-random.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-ripemd.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-rsa.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-sha.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-template_instnt.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-tftables.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-twofish.Plo
extra/yassl/taocrypt/test/.deps/test-test.Po
extra/yassl/taocrypt/test/test
extra/yassl/testsuite/.deps/testsuite-client.Po
extra/yassl/testsuite/.deps/testsuite-echoclient.Po
extra/yassl/testsuite/.deps/testsuite-echoserver.Po
extra/yassl/testsuite/.deps/testsuite-server.Po
extra/yassl/testsuite/.deps/testsuite-test.Po
extra/yassl/testsuite/.deps/testsuite-testsuite.Po
extra/yassl/testsuite/testsuite
fcns.c
fcns.h
gdbinit
Expand Down
29 changes: 15 additions & 14 deletions BUILD/SETUP.sh
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
#!/bin/sh

# Copyright (c) 2000, 2014, 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 Library General Public
# License as published by the Free Software Foundation; version 2
# of the License.
# 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,
# as published by the Free Software Foundation.
#
# This program is also distributed with certain software (including
# but not limited to OpenSSL) that is licensed under separate terms,
# as designated in a particular file or component or in included license
# documentation. The authors of MySQL hereby grant you an additional
# permission to link the program and your derivative works with the
# separately licensed software that they have included with MySQL.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Library General Public License for more details.
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License, version 2.0, for more details.
#
# You should have received a copy of the GNU Library General Public
# License along with this library; if not, write to the Free
Expand Down Expand Up @@ -100,11 +106,8 @@ path=`dirname $0`
export AM_MAKEFLAGS
AM_MAKEFLAGS="-j 6"

# SSL library to use.--with-ssl will select our bundled yaSSL
# implementation of SSL. To use openSSl you will nee too point out
# the location of openSSL headers and lbs on your system.
# Ex --with-ssl=/usr
SSL_LIBRARY=--with-ssl
# SSL library to use.
SSL_LIBRARY=--with-ssl=system

if [ "x$warning_mode" = "xpedantic" ]; then
warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE"
Expand Down Expand Up @@ -232,11 +235,9 @@ fi

# The -fprofile-arcs and -ftest-coverage options cause GCC to instrument the
# code with profiling information used by gcov.
# The -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.
# The -DHAVE_gcov enables code to write out coverage info even when crashing.

gcov_compile_flags="-fprofile-arcs -ftest-coverage"
gcov_compile_flags="$gcov_compile_flags -DDISABLE_TAO_ASM"
gcov_compile_flags="$gcov_compile_flags -DMYSQL_SERVER_SUFFIX=-gcov -DHAVE_gcov"

# GCC4 needs -fprofile-arcs -ftest-coverage on the linker command line (as well
Expand Down
18 changes: 12 additions & 6 deletions BUILD/autorun.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,21 @@

# Copyright (c) 2005, 2010, 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 Library General Public
# License as published by the Free Software Foundation; version 2
# of the License.
# 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,
# as published by the Free Software Foundation.
#
# This program is also distributed with certain software (including
# but not limited to OpenSSL) that is licensed under separate terms,
# as designated in a particular file or component or in included license
# documentation. The authors of MySQL hereby grant you an additional
# permission to link the program and your derivative works with the
# separately licensed software that they have included with MySQL.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Library General Public License for more details.
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License, version 2.0, for more details.
#
# You should have received a copy of the GNU Library General Public
# License along with this library; if not, write to the Free
Expand Down
18 changes: 12 additions & 6 deletions BUILD/cmake_configure.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,21 @@

# Copyright (c) 2009, 2010, 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 Library General Public
# License as published by the Free Software Foundation; version 2
# of the License.
# 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,
# as published by the Free Software Foundation.
#
# This program is also distributed with certain software (including
# but not limited to OpenSSL) that is licensed under separate terms,
# as designated in a particular file or component or in included license
# documentation. The authors of MySQL hereby grant you an additional
# permission to link the program and your derivative works with the
# separately licensed software that they have included with MySQL.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Library General Public License for more details.
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License, version 2.0, for more details.
#
# You should have received a copy of the GNU Library General Public
# License along with this library; if not, write to the Free
Expand Down
13 changes: 10 additions & 3 deletions BUILD/compile-dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,20 @@
# Copyright (c) 2004, 2012, 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
# the Free Software Foundation; version 2 of the License.
# it under the terms of the GNU General Public License, version 2.0,
# as published by the Free Software Foundation.
#
# This program is also distributed with certain software (including
# but not limited to OpenSSL) that is licensed under separate terms,
# as designated in a particular file or component or in included license
# documentation. The authors of MySQL hereby grant you an additional
# permission to link the program and your derivative works with the
# separately licensed software that they have included with MySQL.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# GNU General Public License, version 2.0, for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
Expand Down
17 changes: 12 additions & 5 deletions BUILD/compile-pentium
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,21 @@
# Copyright (c) 2000, 2012, 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
# the Free Software Foundation; version 2 of the License.
#
# it under the terms of the GNU General Public License, version 2.0,
# as published by the Free Software Foundation.
#
# This program is also distributed with certain software (including
# but not limited to OpenSSL) that is licensed under separate terms,
# as designated in a particular file or component or in included license
# documentation. The authors of MySQL hereby grant you an additional
# permission to link the program and your derivative works with the
# separately licensed software that they have included with MySQL.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# GNU General Public License, version 2.0, for more details.
#
# 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
Expand Down
17 changes: 12 additions & 5 deletions BUILD/compile-pentium-debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,21 @@
# Copyright (c) 2000, 2012, 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
# the Free Software Foundation; version 2 of the License.
#
# it under the terms of the GNU General Public License, version 2.0,
# as published by the Free Software Foundation.
#
# This program is also distributed with certain software (including
# but not limited to OpenSSL) that is licensed under separate terms,
# as designated in a particular file or component or in included license
# documentation. The authors of MySQL hereby grant you an additional
# permission to link the program and your derivative works with the
# separately licensed software that they have included with MySQL.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# GNU General Public License, version 2.0, for more details.
#
# 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
Expand Down
17 changes: 12 additions & 5 deletions BUILD/compile-pentium-debug-max
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,21 @@
# Copyright (c) 2001, 2012, 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
# the Free Software Foundation; version 2 of the License.
#
# it under the terms of the GNU General Public License, version 2.0,
# as published by the Free Software Foundation.
#
# This program is also distributed with certain software (including
# but not limited to OpenSSL) that is licensed under separate terms,
# as designated in a particular file or component or in included license
# documentation. The authors of MySQL hereby grant you an additional
# permission to link the program and your derivative works with the
# separately licensed software that they have included with MySQL.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# GNU General Public License, version 2.0, for more details.
#
# 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
Expand Down
17 changes: 12 additions & 5 deletions BUILD/compile-pentium-debug-max-no-ndb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,21 @@
# Copyright (c) 2001, 2012, 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
# the Free Software Foundation; version 2 of the License.
#
# it under the terms of the GNU General Public License, version 2.0,
# as published by the Free Software Foundation.
#
# This program is also distributed with certain software (including
# but not limited to OpenSSL) that is licensed under separate terms,
# as designated in a particular file or component or in included license
# documentation. The authors of MySQL hereby grant you an additional
# permission to link the program and your derivative works with the
# separately licensed software that they have included with MySQL.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# GNU General Public License, version 2.0, for more details.
#
# 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
Expand Down
17 changes: 12 additions & 5 deletions BUILD/compile-pentium-gcov
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,21 @@
# Copyright (c) 2000, 2012, 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
# the Free Software Foundation; version 2 of the License.
#
# it under the terms of the GNU General Public License, version 2.0,
# as published by the Free Software Foundation.
#
# This program is also distributed with certain software (including
# but not limited to OpenSSL) that is licensed under separate terms,
# as designated in a particular file or component or in included license
# documentation. The authors of MySQL hereby grant you an additional
# permission to link the program and your derivative works with the
# separately licensed software that they have included with MySQL.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# GNU General Public License, version 2.0, for more details.
#
# 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
Expand Down
17 changes: 12 additions & 5 deletions BUILD/compile-pentium-gprof
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,21 @@
# Copyright (c) 2000, 2012, 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
# the Free Software Foundation; version 2 of the License.
#
# it under the terms of the GNU General Public License, version 2.0,
# as published by the Free Software Foundation.
#
# This program is also distributed with certain software (including
# but not limited to OpenSSL) that is licensed under separate terms,
# as designated in a particular file or component or in included license
# documentation. The authors of MySQL hereby grant you an additional
# permission to link the program and your derivative works with the
# separately licensed software that they have included with MySQL.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# GNU General Public License, version 2.0, for more details.
#
# 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
Expand Down
17 changes: 12 additions & 5 deletions BUILD/compile-pentium-valgrind-max
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,21 @@
# Copyright (c) 2002, 2014, 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
# the Free Software Foundation; version 2 of the License.
#
# it under the terms of the GNU General Public License, version 2.0,
# as published by the Free Software Foundation.
#
# This program is also distributed with certain software (including
# but not limited to OpenSSL) that is licensed under separate terms,
# as designated in a particular file or component or in included license
# documentation. The authors of MySQL hereby grant you an additional
# permission to link the program and your derivative works with the
# separately licensed software that they have included with MySQL.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# GNU General Public License, version 2.0, for more details.
#
# 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
Expand Down
Loading

0 comments on commit b90d9b1

Please sign in to comment.