Skip to content

Commit 26a14ee

Browse files
committed
Merge 10.1 into 10.2
2 parents 8ce702a + cb248f8 commit 26a14ee

File tree

4,033 files changed

+4087
-4087
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,033 files changed

+4087
-4087
lines changed

BUILD/FINISH.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# You should have received a copy of the GNU Library General Public
1414
# License along with this library; if not, write to the Free
1515
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
16-
# MA 02110-1301, USA
16+
# MA 02110-1335 USA
1717

1818
cflags="$c_warnings $extra_flags $EXTRA_FLAGS $EXTRA_CFLAGS"
1919
cxxflags="$cxx_warnings $base_cxxflags $extra_flags $EXTRA_FLAGS $EXTRA_CXXFLAGS"

BUILD/SETUP.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# You should have received a copy of the GNU Library General Public
1616
# License along with this library; if not, write to the Free
1717
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
18-
# MA 02110-1301, USA
18+
# MA 02110-1335 USA
1919

2020
########################################################################
2121

BUILD/autorun.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# You should have received a copy of the GNU Library General Public
1616
# License along with this library; if not, write to the Free
1717
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
18-
# MA 02110-1301, USA
18+
# MA 02110-1335 USA
1919

2020
# Create MySQL cmake configure wrapper
2121

BUILD/check-cpu

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#
1313
# You should have received a copy of the GNU General Public License
1414
# along with this program; if not, write to the Free Software
15-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
1616

1717
#
1818
# Check cpu of current machine and find the

BUILD/cleanup

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
16+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1717

1818
path=`dirname $0`
1919
. "$path/SETUP.sh"

BUILD/cmake_configure.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# You should have received a copy of the GNU Library General Public
1616
# License along with this library; if not, write to the Free
1717
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
18-
# MA 02110-1301, USA
18+
# MA 02110-1335 USA
1919

2020
# Ensure cmake and perl are there
2121
cmake --help >/dev/null 2>&1 || HAVE_CMAKE=no

BUILD/compile-alpha

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
16+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1717

1818
path=`dirname $0`
1919
. "$path/SETUP.sh"

BUILD/compile-amd64-debug-max

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
# You should have received a copy of the GNU General Public License
1616
# along with this program; if not, write to the Free Software
17-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
17+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1818

1919
path=`dirname $0`
2020
. "$path/SETUP.sh"

BUILD/compile-amd64-gcov

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
16+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1717

1818
path=`dirname $0`
1919
. "$path/SETUP.sh"

BUILD/compile-amd64-gprof

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
16+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1717

1818
path=`dirname $0`
1919
. "$path/SETUP.sh"

BUILD/compile-amd64-max

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
# You should have received a copy of the GNU General Public License
1616
# along with this program; if not, write to the Free Software
17-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
17+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1818

1919
path=`dirname $0`
2020
. "$path/SETUP.sh"

BUILD/compile-amd64-valgrind-max

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# You should have received a copy of the GNU Library General Public
1616
# License along with this library; if not, write to the Free
1717
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
18-
# MA 02110-1301, USA
18+
# MA 02110-1335 USA
1919

2020
path=`dirname $0`
2121
. "$path/SETUP.sh"

BUILD/compile-bintar

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
# You should have received a copy of the GNU General Public License
1616
# along with this program; if not, write to the Free Software
17-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA.
17+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA.
1818

1919

2020
# This script's purpose is to build the binary tarball packages for MariaDB

BUILD/compile-darwin-mwcc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
# You should have received a copy of the GNU General Public License
1616
# along with this program; if not, write to the Free Software
17-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
17+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1818

1919
path=`dirname $0`
2020
. "$path/SETUP.sh"

BUILD/compile-dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
16+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
1717

1818
#
1919
# This script's purpose is to update the automake/autoconf helper scripts and

BUILD/compile-hpux11-parisc2-aCC

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
# You should have received a copy of the GNU General Public License
1616
# along with this program; if not, write to the Free Software
17-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
17+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1818

1919
if [ ! -f "sql/mysqld.cc" ]; then
2020
echo "You must run this script from the MySQL top-level directory."

BUILD/compile-ia64-debug-max

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
16+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
1717

1818
gmake -k maintainer-clean || true
1919
/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache

BUILD/compile-innodb

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#
1313
# You should have received a copy of the GNU General Public License along with
1414
# this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St,
15-
# Fifth Floor, Boston, MA 02110-1301 USA
15+
# Fifth Floor, Boston, MA 02110-1335 USA
1616
#
1717

1818
# we assume this script is in storage/innobase/

BUILD/compile-irix-mips64-mipspro

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
# You should have received a copy of the GNU General Public License
1616
# along with this program; if not, write to the Free Software
17-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
17+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1818

1919
if [ ! -f "sql/mysqld.cc" ]; then
2020
echo "You must run this script from the MySQL top-level directory."

BUILD/compile-pentium

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
# You should have received a copy of the GNU General Public License
1616
# along with this program; if not, write to the Free Software
17-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
17+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1818

1919
path=`dirname $0`
2020
. "$path/SETUP.sh"

BUILD/compile-pentium-cybozu

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
16+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1717

1818
path=`dirname $0`
1919
. "$path/SETUP.sh"

BUILD/compile-pentium-debug

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
16+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
1717

1818
path=`dirname $0`
1919
. "$path/SETUP.sh"

BUILD/compile-pentium-debug-max

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
16+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
1717

1818
path=`dirname $0`
1919
. "$path/SETUP.sh"

BUILD/compile-pentium-debug-max-no-embedded

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
# You should have received a copy of the GNU General Public License
1616
# along with this program; if not, write to the Free Software
17-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
17+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1818

1919
path=`dirname $0`
2020
. "$path/SETUP.sh"

BUILD/compile-pentium-debug-openssl

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
16+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
1717

1818
path=`dirname $0`
1919
. "$path/SETUP.sh"

BUILD/compile-pentium-debug-yassl

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
16+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
1717

1818
path=`dirname $0`
1919
. "$path/SETUP.sh"

BUILD/compile-pentium-gcov

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
16+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1717

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

BUILD/compile-pentium-gprof

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
16+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1717

1818
path=`dirname $0`
1919
. "$path/SETUP.sh"

BUILD/compile-pentium-icc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
# You should have received a copy of the GNU General Public License
1616
# along with this program; if not, write to the Free Software
17-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
17+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1818

1919
path=`dirname $0`
2020
. "$path/SETUP.sh"

BUILD/compile-pentium-icc-valgrind-max

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#
1313
# You should have received a copy of the GNU General Public License
1414
# along with this program; if not, write to the Free Software
15-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
1616

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

3232
path=`dirname $0`
3333
. "$path/SETUP.sh"

BUILD/compile-pentium-icc-yassl

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
# You should have received a copy of the GNU General Public License
1616
# along with this program; if not, write to the Free Software
17-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
17+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1818

1919
path=`dirname $0`
2020
. "$path/SETUP.sh"

BUILD/compile-pentium-max

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
# You should have received a copy of the GNU General Public License
1616
# along with this program; if not, write to the Free Software
17-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
17+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1818

1919
path=`dirname $0`
2020
. "$path/SETUP.sh"

BUILD/compile-pentium-valgrind-max

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#
1313
# You should have received a copy of the GNU General Public License
1414
# along with this program; if not, write to the Free Software
15-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
1616

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

3232
path=`dirname $0`
3333
. "$path/SETUP.sh"

BUILD/compile-pentium64-asan-max

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#
1313
# You should have received a copy of the GNU General Public License
1414
# along with this program; if not, write to the Free Software
15-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1616

1717
path=`dirname $0`
1818
. "$path/SETUP.sh"

BUILD/compile-pentium64-debug

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
16+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
1717

1818
path=`dirname $0`
1919
. "$path/SETUP.sh"

BUILD/compile-pentium64-debug-max

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
16+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
1717

1818
path=`dirname $0`
1919
. "$path/SETUP.sh"

BUILD/compile-pentium64-gcov

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
# You should have received a copy of the GNU General Public License
1616
# along with this program; if not, write to the Free Software
17-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
17+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1818

1919
path=`dirname $0`
2020
. "$path/SETUP.sh"

BUILD/compile-pentium64-gprof

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
# You should have received a copy of the GNU General Public License
1616
# along with this program; if not, write to the Free Software
17-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
17+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1818

1919
path=`dirname $0`
2020
. "$path/SETUP.sh"

BUILD/compile-pentium64-max

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# You should have received a copy of the GNU Library General Public
1717
# License along with this library; if not, write to the Free
1818
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
19-
# MA 02110-1301, USA
19+
# MA 02110-1335 USA
2020

2121
path=`dirname $0`
2222
. "$path/SETUP.sh"

BUILD/compile-pentium64-valgrind-max

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#
1313
# You should have received a copy of the GNU General Public License
1414
# along with this program; if not, write to the Free Software
15-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
1616

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

3232
path=`dirname $0`
3333
. "$path/SETUP.sh"

BUILD/compile-pentium64-wsrep

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# You should have received a copy of the GNU Library General Public
1616
# License along with this library; if not, write to the Free
1717
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
18-
# MA 02111-1301, USA
18+
# MA 02110-1335 USA
1919

2020
path=`dirname $0`
2121
. "$path/SETUP.sh"

0 commit comments

Comments
 (0)