Skip to content

Commit 10eacd5

Browse files
sanja-byelkinsanja-byelkin
committed
Merge branch 'merge-perfschema-5.6' into 10.1
2 parents 5ce6ec3 + 3aff3f3 commit 10eacd5

File tree

184 files changed

+1844
-557
lines changed

Some content is hidden

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

184 files changed

+1844
-557
lines changed

‎include/mysql/psi/mysql_file.h

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

‎include/mysql/psi/mysql_idle.h

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

‎include/mysql/psi/mysql_socket.h

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
22
3-
This program is free software; you can redistribute it and/or
4-
modify it under the terms of the GNU General Public License as
5-
published by the Free Software Foundation; version 2 of the
6-
License.
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.
6+
7+
This program is also distributed with certain software (including
8+
but not limited to OpenSSL) that is licensed under separate terms,
9+
as designated in a particular file or component or in included license
10+
documentation. The authors of MySQL hereby grant you an additional
11+
permission to link the program and your derivative works with the
12+
separately licensed software that they have included with MySQL.
713
814
This program is distributed in the hope that it will be useful,
915
but WITHOUT ANY WARRANTY; without even the implied warranty of
10-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11-
GNU General Public License for more details.
16+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
GNU General Public License, version 2.0, for more details.
1218
1319
You should have received a copy of the GNU General Public License
1420
along with this program; if not, write to the Free Software

‎include/mysql/psi/mysql_stage.h

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

‎include/mysql/psi/mysql_statement.h

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

‎include/mysql/psi/mysql_table.h

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

‎include/mysql/psi/mysql_thread.h

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

‎include/mysql/psi/psi.h

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

‎include/mysql/psi/psi_abi_v0.h

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

‎include/mysql/psi/psi_abi_v1.h

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

0 commit comments

Comments
 (0)