Skip to content

Commit 76620f5

Browse files
dahlerlenddahlerlend
committed
Merge branch 'mysql-8.0' into mysql-8.4
Change-Id: I1e89068a91262c2430426d67ac6135dea525d173
2 parents 906979b + 0a3d3e6 commit 76620f5

File tree

7 files changed

+89
-91
lines changed

7 files changed

+89
-91
lines changed

‎mysys/strxmov.cc‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
/* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
22
3-
This library is free software; you can redistribute it and/or
4-
modify it under the terms of the GNU Library General Public
5-
License, version 2.0, as published by the Free Software Foundation.
3+
This program is free software; you can redistribute it and/or modify
4+
it under the terms of the GNU General Public License, version 2.0,
5+
as published by the Free Software Foundation.
66
7-
This library is designed to work with certain software (including
7+
This program is designed to work with certain software (including
88
but not limited to OpenSSL) that is licensed under separate terms,
99
as designated in a particular file or component or in included license
1010
documentation. The authors of MySQL hereby grant you an additional
11-
permission to link the library and your derivative works with the
11+
permission to link the program and your derivative works with the
1212
separately licensed software that they have either included with
13-
the library or referenced in the documentation.
13+
the program or referenced in the documentation.
1414
1515
Without limiting anything contained in the foregoing, this file,
1616
which is part of C Driver for MySQL (Connector/C), is also subject to the
1717
Universal FOSS Exception, version 1.0, a copy of which can be found at
1818
http://oss.oracle.com/licenses/universal-foss-exception.
1919
20-
This library is distributed in the hope that it will be useful,
20+
This program is distributed in the hope that it will be useful,
2121
but WITHOUT ANY WARRANTY; without even the implied warranty of
22-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
23-
Library General Public License, version 2.0, for more details.
22+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23+
GNU General Public License, version 2.0, for more details.
2424
25-
You should have received a copy of the GNU Library General Public
26-
License along with this library; if not, write to the Free
27-
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
28-
MA 02110-1301 USA */
25+
You should have received a copy of the GNU General Public License
26+
along with this program; if not, write to the Free Software
27+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
2928

3029
/* File : strxmov.c
3130
Author : Richard A. O'Keefe.

‎mysys/strxnmov.cc‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
/* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
22
3-
This library is free software; you can redistribute it and/or
4-
modify it under the terms of the GNU Library General Public
5-
License, version 2.0, as published by the Free Software Foundation.
3+
This program is free software; you can redistribute it and/or modify
4+
it under the terms of the GNU General Public License, version 2.0,
5+
as published by the Free Software Foundation.
66
7-
This library is designed to work with certain software (including
7+
This program is designed to work with certain software (including
88
but not limited to OpenSSL) that is licensed under separate terms,
99
as designated in a particular file or component or in included license
1010
documentation. The authors of MySQL hereby grant you an additional
11-
permission to link the library and your derivative works with the
11+
permission to link the program and your derivative works with the
1212
separately licensed software that they have either included with
13-
the library or referenced in the documentation.
13+
the program or referenced in the documentation.
1414
1515
Without limiting anything contained in the foregoing, this file,
1616
which is part of C Driver for MySQL (Connector/C), is also subject to the
1717
Universal FOSS Exception, version 1.0, a copy of which can be found at
1818
http://oss.oracle.com/licenses/universal-foss-exception.
1919
20-
This library is distributed in the hope that it will be useful,
20+
This program is distributed in the hope that it will be useful,
2121
but WITHOUT ANY WARRANTY; without even the implied warranty of
22-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
23-
Library General Public License, version 2.0, for more details.
22+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23+
GNU General Public License, version 2.0, for more details.
2424
25-
You should have received a copy of the GNU Library General Public
26-
License along with this library; if not, write to the Free
27-
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
28-
MA 02110-1301 USA */
25+
You should have received a copy of the GNU General Public License
26+
along with this program; if not, write to the Free Software
27+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
2928

3029
/* File : strxnmov.c
3130
Author : Richard A. O'Keefe.

‎strings/ctype-uca.cc‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
/* Copyright (c) 2004, 2024, Oracle and/or its affiliates.
22
3-
This library is free software; you can redistribute it and/or
4-
modify it under the terms of the GNU Library General Public
5-
License, version 2.0, as published by the Free Software Foundation.
3+
This program is free software; you can redistribute it and/or modify
4+
it under the terms of the GNU General Public License, version 2.0,
5+
as published by the Free Software Foundation.
66
7-
This library is designed to work with certain software (including
7+
This program is designed to work with certain software (including
88
but not limited to OpenSSL) that is licensed under separate terms,
99
as designated in a particular file or component or in included license
1010
documentation. The authors of MySQL hereby grant you an additional
11-
permission to link the library and your derivative works with the
11+
permission to link the program and your derivative works with the
1212
separately licensed software that they have either included with
13-
the library or referenced in the documentation.
13+
the program or referenced in the documentation.
1414
1515
Without limiting anything contained in the foregoing, this file,
1616
which is part of C Driver for MySQL (Connector/C), is also subject to the
1717
Universal FOSS Exception, version 1.0, a copy of which can be found at
1818
http://oss.oracle.com/licenses/universal-foss-exception.
1919
20-
This library is distributed in the hope that it will be useful,
20+
This program is distributed in the hope that it will be useful,
2121
but WITHOUT ANY WARRANTY; without even the implied warranty of
22-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
23-
Library General Public License, version 2.0, for more details.
22+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23+
GNU General Public License, version 2.0, for more details.
2424
25-
You should have received a copy of the GNU Library General Public
26-
License along with this library; if not, write to the Free
27-
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
28-
MA 02110-1301 USA */
25+
You should have received a copy of the GNU General Public License
26+
along with this program; if not, write to the Free Software
27+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
2928

3029
/*
3130
UCA (Unicode Collation Algorithm) support.

‎strings/ctype-ucs2.cc‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
/* Copyright (c) 2003, 2024, Oracle and/or its affiliates.
22
3-
This library is free software; you can redistribute it and/or
4-
modify it under the terms of the GNU Library General Public
5-
License, version 2.0, as published by the Free Software Foundation.
3+
This program is free software; you can redistribute it and/or modify
4+
it under the terms of the GNU General Public License, version 2.0,
5+
as published by the Free Software Foundation.
66
7-
This library is designed to work with certain software (including
7+
This program is designed to work with certain software (including
88
but not limited to OpenSSL) that is licensed under separate terms,
99
as designated in a particular file or component or in included license
1010
documentation. The authors of MySQL hereby grant you an additional
11-
permission to link the library and your derivative works with the
11+
permission to link the program and your derivative works with the
1212
separately licensed software that they have either included with
13-
the library or referenced in the documentation.
13+
the program or referenced in the documentation.
1414
1515
Without limiting anything contained in the foregoing, this file,
1616
which is part of C Driver for MySQL (Connector/C), is also subject to the
1717
Universal FOSS Exception, version 1.0, a copy of which can be found at
1818
http://oss.oracle.com/licenses/universal-foss-exception.
1919
20-
This library is distributed in the hope that it will be useful,
20+
This program is distributed in the hope that it will be useful,
2121
but WITHOUT ANY WARRANTY; without even the implied warranty of
22-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
23-
Library General Public License, version 2.0, for more details.
22+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23+
GNU General Public License, version 2.0, for more details.
2424
25-
You should have received a copy of the GNU Library General Public
26-
License along with this library; if not, write to the Free
27-
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
28-
MA 02110-1301 USA */
25+
You should have received a copy of the GNU General Public License
26+
along with this program; if not, write to the Free Software
27+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
2928

3029
// UCS-2 support.
3130

‎strings/ctype-utf8.cc‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
/* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
22
3-
This library is free software; you can redistribute it and/or
4-
modify it under the terms of the GNU Library General Public
5-
License, version 2.0, as published by the Free Software Foundation.
3+
This program is free software; you can redistribute it and/or modify
4+
it under the terms of the GNU General Public License, version 2.0,
5+
as published by the Free Software Foundation.
66
7-
This library is designed to work with certain software (including
7+
This program is designed to work with certain software (including
88
but not limited to OpenSSL) that is licensed under separate terms,
99
as designated in a particular file or component or in included license
1010
documentation. The authors of MySQL hereby grant you an additional
11-
permission to link the library and your derivative works with the
11+
permission to link the program and your derivative works with the
1212
separately licensed software that they have either included with
13-
the library or referenced in the documentation.
13+
the program or referenced in the documentation.
1414
1515
Without limiting anything contained in the foregoing, this file,
1616
which is part of C Driver for MySQL (Connector/C), is also subject to the
1717
Universal FOSS Exception, version 1.0, a copy of which can be found at
1818
http://oss.oracle.com/licenses/universal-foss-exception.
1919
20-
This library is distributed in the hope that it will be useful,
20+
This program is distributed in the hope that it will be useful,
2121
but WITHOUT ANY WARRANTY; without even the implied warranty of
22-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
23-
Library General Public License, version 2.0, for more details.
22+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23+
GNU General Public License, version 2.0, for more details.
2424
25-
You should have received a copy of the GNU Library General Public
26-
License along with this library; if not, write to the Free
27-
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
28-
MA 02110-1301 USA */
25+
You should have received a copy of the GNU General Public License
26+
along with this program; if not, write to the Free Software
27+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
2928

3029
// UTF-8, as defined in RFC 2279.
3130

‎strings/dtoa.cc‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
/* Copyright (c) 2007, 2024, Oracle and/or its affiliates.
22
3-
This library is free software; you can redistribute it and/or
4-
modify it under the terms of the GNU Library General Public
5-
License, version 2.0, as published by the Free Software Foundation.
3+
This program is free software; you can redistribute it and/or modify
4+
it under the terms of the GNU General Public License, version 2.0,
5+
as published by the Free Software Foundation.
66
7-
This library is designed to work with certain software (including
7+
This program is designed to work with certain software (including
88
but not limited to OpenSSL) that is licensed under separate terms,
99
as designated in a particular file or component or in included license
1010
documentation. The authors of MySQL hereby grant you an additional
11-
permission to link the library and your derivative works with the
11+
permission to link the program and your derivative works with the
1212
separately licensed software that they have either included with
13-
the library or referenced in the documentation.
13+
the program or referenced in the documentation.
1414
1515
Without limiting anything contained in the foregoing, this file,
1616
which is part of C Driver for MySQL (Connector/C), is also subject to the
1717
Universal FOSS Exception, version 1.0, a copy of which can be found at
1818
http://oss.oracle.com/licenses/universal-foss-exception.
1919
20-
This library is distributed in the hope that it will be useful,
20+
This program is distributed in the hope that it will be useful,
2121
but WITHOUT ANY WARRANTY; without even the implied warranty of
22-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
23-
Library General Public License, version 2.0, for more details.
22+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23+
GNU General Public License, version 2.0, for more details.
2424
25-
You should have received a copy of the GNU Library General Public
26-
License along with this library; if not, write to the Free
27-
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
28-
MA 02110-1301 USA */
25+
You should have received a copy of the GNU General Public License
26+
along with this program; if not, write to the Free Software
27+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
2928

3029
/****************************************************************
3130

‎strings/mb_wc.h‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,31 @@
33

44
/* Copyright (c) 2016, 2024, Oracle and/or its affiliates.
55
6-
This library is free software; you can redistribute it and/or
7-
modify it under the terms of the GNU Library General Public
8-
License, version 2.0, as published by the Free Software Foundation.
6+
This program is free software; you can redistribute it and/or modify
7+
it under the terms of the GNU General Public License, version 2.0,
8+
as published by the Free Software Foundation.
99
10-
This library is designed to work with certain software (including
10+
This program is designed to work with certain software (including
1111
but not limited to OpenSSL) that is licensed under separate terms,
1212
as designated in a particular file or component or in included license
1313
documentation. The authors of MySQL hereby grant you an additional
14-
permission to link the library and your derivative works with the
14+
permission to link the program and your derivative works with the
1515
separately licensed software that they have either included with
16-
the library or referenced in the documentation.
16+
the program or referenced in the documentation.
1717
18-
This library is distributed in the hope that it will be useful,
18+
Without limiting anything contained in the foregoing, this file,
19+
which is part of C Driver for MySQL (Connector/C), is also subject to the
20+
Universal FOSS Exception, version 1.0, a copy of which can be found at
21+
http://oss.oracle.com/licenses/universal-foss-exception.
22+
23+
This program is distributed in the hope that it will be useful,
1924
but WITHOUT ANY WARRANTY; without even the implied warranty of
20-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
21-
Library General Public License, version 2.0, for more details.
25+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
26+
GNU General Public License, version 2.0, for more details.
2227
23-
You should have received a copy of the GNU Library General Public
24-
License along with this library; if not, write to the Free
25-
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
26-
MA 02110-1301 USA */
28+
You should have received a copy of the GNU General Public License
29+
along with this program; if not, write to the Free Software
30+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
2731

2832
/**
2933
@file mb_wc.h

0 commit comments

Comments
 (0)