Skip to content

Commit 54f353c

Browse files
arnabray21arnabray21
committed
Merge branch 'mysql-5.6-cluster-7.3' into mysql-5.6-cluster-7.4
(Merge tag 'clone-5.6.46-build' into mysql-5.6-cluster-7.3) Change-Id: Ida1e07043d3cc9e8e9f440a127acb47744a64051
2 parents e6c9903 + ab1dd6f commit 54f353c

File tree

3,729 files changed

+41212
-13668
lines changed

Some content is hidden

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

3,729 files changed

+41212
-13668
lines changed

‎BUILD/SETUP.sh‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,21 @@
22

33
# Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
44
#
5-
# This program is free software; you can redistribute it and/or
6-
# modify it under the terms of the GNU Library General Public
7-
# License as published by the Free Software Foundation; version 2
8-
# of the License.
5+
# This program is free software; you can redistribute it and/or modify
6+
# it under the terms of the GNU General Public License, version 2.0,
7+
# as published by the Free Software Foundation.
8+
#
9+
# This program is also distributed with certain software (including
10+
# but not limited to OpenSSL) that is licensed under separate terms,
11+
# as designated in a particular file or component or in included license
12+
# documentation. The authors of MySQL hereby grant you an additional
13+
# permission to link the program and your derivative works with the
14+
# separately licensed software that they have included with MySQL.
915
#
1016
# This program is distributed in the hope that it will be useful,
1117
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13-
# Library General Public License for more details.
18+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
# GNU General Public License, version 2.0, for more details.
1420
#
1521
# You should have received a copy of the GNU Library General Public
1622
# License along with this library; if not, write to the Free

‎BUILD/autorun.sh‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,21 @@
22

33
# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
44
#
5-
# This program is free software; you can redistribute it and/or
6-
# modify it under the terms of the GNU Library General Public
7-
# License as published by the Free Software Foundation; version 2
8-
# of the License.
5+
# This program is free software; you can redistribute it and/or modify
6+
# it under the terms of the GNU General Public License, version 2.0,
7+
# as published by the Free Software Foundation.
8+
#
9+
# This program is also distributed with certain software (including
10+
# but not limited to OpenSSL) that is licensed under separate terms,
11+
# as designated in a particular file or component or in included license
12+
# documentation. The authors of MySQL hereby grant you an additional
13+
# permission to link the program and your derivative works with the
14+
# separately licensed software that they have included with MySQL.
915
#
1016
# This program is distributed in the hope that it will be useful,
1117
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13-
# Library General Public License for more details.
18+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
# GNU General Public License, version 2.0, for more details.
1420
#
1521
# You should have received a copy of the GNU Library General Public
1622
# License along with this library; if not, write to the Free

‎BUILD/build_mccge.sh‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,21 @@
22

33
# Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
44
#
5-
# This program is free software; you can redistribute it and/or
6-
# modify it under the terms of the GNU Library General Public
7-
# License as published by the Free Software Foundation; version 2
8-
# of the License.
5+
# This program is free software; you can redistribute it and/or modify
6+
# it under the terms of the GNU General Public License, version 2.0,
7+
# as published by the Free Software Foundation.
8+
#
9+
# This program is also distributed with certain software (including
10+
# but not limited to OpenSSL) that is licensed under separate terms,
11+
# as designated in a particular file or component or in included license
12+
# documentation. The authors of MySQL hereby grant you an additional
13+
# permission to link the program and your derivative works with the
14+
# separately licensed software that they have included with MySQL.
915
#
1016
# This program is distributed in the hope that it will be useful,
1117
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13-
# Library General Public License for more details.
18+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
# GNU General Public License, version 2.0, for more details.
1420
#
1521
# You should have received a copy of the GNU Library General Public
1622
# License along with this library; if not, write to the Free

‎BUILD/cmake_configure.sh‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,21 @@
22

33
# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
44
#
5-
# This program is free software; you can redistribute it and/or
6-
# modify it under the terms of the GNU Library General Public
7-
# License as published by the Free Software Foundation; version 2
8-
# of the License.
5+
# This program is free software; you can redistribute it and/or modify
6+
# it under the terms of the GNU General Public License, version 2.0,
7+
# as published by the Free Software Foundation.
8+
#
9+
# This program is also distributed with certain software (including
10+
# but not limited to OpenSSL) that is licensed under separate terms,
11+
# as designated in a particular file or component or in included license
12+
# documentation. The authors of MySQL hereby grant you an additional
13+
# permission to link the program and your derivative works with the
14+
# separately licensed software that they have included with MySQL.
915
#
1016
# This program is distributed in the hope that it will be useful,
1117
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13-
# Library General Public License for more details.
18+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
# GNU General Public License, version 2.0, for more details.
1420
#
1521
# You should have received a copy of the GNU Library General Public
1622
# License along with this library; if not, write to the Free

‎BUILD/compile-dist‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,20 @@
33
# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
44
#
55
# This program is free software; you can redistribute it and/or modify
6-
# it under the terms of the GNU General Public License as published by
7-
# the Free Software Foundation; version 2 of the License.
6+
# it under the terms of the GNU General Public License, version 2.0,
7+
# as published by the Free Software Foundation.
8+
#
9+
# This program is also distributed with certain software (including
10+
# but not limited to OpenSSL) that is licensed under separate terms,
11+
# as designated in a particular file or component or in included license
12+
# documentation. The authors of MySQL hereby grant you an additional
13+
# permission to link the program and your derivative works with the
14+
# separately licensed software that they have included with MySQL.
815
#
916
# This program is distributed in the hope that it will be useful,
1017
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1118
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
# GNU General Public License for more details.
19+
# GNU General Public License, version 2.0, for more details.
1320
#
1421
# You should have received a copy of the GNU General Public License
1522
# along with this program; if not, write to the Free Software

‎BUILD/compile-pentium‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,21 @@
33
# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
44
#
55
# This program is free software; you can redistribute it and/or modify
6-
# it under the terms of the GNU General Public License as published by
7-
# the Free Software Foundation; version 2 of the License.
8-
#
6+
# it under the terms of the GNU General Public License, version 2.0,
7+
# as published by the Free Software Foundation.
8+
#
9+
# This program is also distributed with certain software (including
10+
# but not limited to OpenSSL) that is licensed under separate terms,
11+
# as designated in a particular file or component or in included license
12+
# documentation. The authors of MySQL hereby grant you an additional
13+
# permission to link the program and your derivative works with the
14+
# separately licensed software that they have included with MySQL.
15+
#
916
# This program is distributed in the hope that it will be useful,
1017
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1118
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
# GNU General Public License for more details.
13-
#
19+
# GNU General Public License, version 2.0, for more details.
20+
#
1421
# You should have received a copy of the GNU General Public License
1522
# along with this program; if not, write to the Free Software
1623
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA

‎BUILD/compile-pentium-debug‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,21 @@
33
# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
44
#
55
# This program is free software; you can redistribute it and/or modify
6-
# it under the terms of the GNU General Public License as published by
7-
# the Free Software Foundation; version 2 of the License.
8-
#
6+
# it under the terms of the GNU General Public License, version 2.0,
7+
# as published by the Free Software Foundation.
8+
#
9+
# This program is also distributed with certain software (including
10+
# but not limited to OpenSSL) that is licensed under separate terms,
11+
# as designated in a particular file or component or in included license
12+
# documentation. The authors of MySQL hereby grant you an additional
13+
# permission to link the program and your derivative works with the
14+
# separately licensed software that they have included with MySQL.
15+
#
916
# This program is distributed in the hope that it will be useful,
1017
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1118
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
# GNU General Public License for more details.
13-
#
19+
# GNU General Public License, version 2.0, for more details.
20+
#
1421
# You should have received a copy of the GNU General Public License
1522
# along with this program; if not, write to the Free Software
1623
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

‎BUILD/compile-pentium-debug-max‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,21 @@
33
# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
44
#
55
# This program is free software; you can redistribute it and/or modify
6-
# it under the terms of the GNU General Public License as published by
7-
# the Free Software Foundation; version 2 of the License.
8-
#
6+
# it under the terms of the GNU General Public License, version 2.0,
7+
# as published by the Free Software Foundation.
8+
#
9+
# This program is also distributed with certain software (including
10+
# but not limited to OpenSSL) that is licensed under separate terms,
11+
# as designated in a particular file or component or in included license
12+
# documentation. The authors of MySQL hereby grant you an additional
13+
# permission to link the program and your derivative works with the
14+
# separately licensed software that they have included with MySQL.
15+
#
916
# This program is distributed in the hope that it will be useful,
1017
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1118
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
# GNU General Public License for more details.
13-
#
19+
# GNU General Public License, version 2.0, for more details.
20+
#
1421
# You should have received a copy of the GNU General Public License
1522
# along with this program; if not, write to the Free Software
1623
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

‎BUILD/compile-pentium-debug-max-no-ndb‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,21 @@
33
# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
44
#
55
# This program is free software; you can redistribute it and/or modify
6-
# it under the terms of the GNU General Public License as published by
7-
# the Free Software Foundation; version 2 of the License.
8-
#
6+
# it under the terms of the GNU General Public License, version 2.0,
7+
# as published by the Free Software Foundation.
8+
#
9+
# This program is also distributed with certain software (including
10+
# but not limited to OpenSSL) that is licensed under separate terms,
11+
# as designated in a particular file or component or in included license
12+
# documentation. The authors of MySQL hereby grant you an additional
13+
# permission to link the program and your derivative works with the
14+
# separately licensed software that they have included with MySQL.
15+
#
916
# This program is distributed in the hope that it will be useful,
1017
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1118
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
# GNU General Public License for more details.
13-
#
19+
# GNU General Public License, version 2.0, for more details.
20+
#
1421
# You should have received a copy of the GNU General Public License
1522
# along with this program; if not, write to the Free Software
1623
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA

‎BUILD/compile-pentium-gcov‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,21 @@
33
# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
44
#
55
# This program is free software; you can redistribute it and/or modify
6-
# it under the terms of the GNU General Public License as published by
7-
# the Free Software Foundation; version 2 of the License.
8-
#
6+
# it under the terms of the GNU General Public License, version 2.0,
7+
# as published by the Free Software Foundation.
8+
#
9+
# This program is also distributed with certain software (including
10+
# but not limited to OpenSSL) that is licensed under separate terms,
11+
# as designated in a particular file or component or in included license
12+
# documentation. The authors of MySQL hereby grant you an additional
13+
# permission to link the program and your derivative works with the
14+
# separately licensed software that they have included with MySQL.
15+
#
916
# This program is distributed in the hope that it will be useful,
1017
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1118
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
# GNU General Public License for more details.
13-
#
19+
# GNU General Public License, version 2.0, for more details.
20+
#
1421
# You should have received a copy of the GNU General Public License
1522
# along with this program; if not, write to the Free Software
1623
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA

0 commit comments

Comments
 (0)