Skip to content

Commit 36ebd70

Browse files
vuvovavuvova
committed
5.7.28
1 parent 15f60c1 commit 36ebd70

File tree

426 files changed

+5077
-2340
lines changed

Some content is hidden

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

426 files changed

+5077
-2340
lines changed

‎include/mysql/psi/mysql_file.h

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1-
/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2008, 2017, 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,
@@ -1306,12 +1313,12 @@ inline_mysql_file_rename(
13061313
struct PSI_file_locker *locker;
13071314
PSI_file_locker_state state;
13081315
locker= PSI_FILE_CALL(get_thread_file_name_locker)
1309-
(&state, key, PSI_FILE_RENAME, to, &locker);
1316+
(&state, key, PSI_FILE_RENAME, from, &locker);
13101317
if (likely(locker != NULL))
13111318
{
13121319
PSI_FILE_CALL(start_file_wait)(locker, (size_t) 0, src_file, src_line);
13131320
result= my_rename(from, to, flags);
1314-
PSI_FILE_CALL(end_file_wait)(locker, (size_t) 0);
1321+
PSI_FILE_CALL(end_file_rename_wait)(locker, from, to, result);
13151322
return result;
13161323
}
13171324
#endif
@@ -1387,12 +1394,12 @@ inline_mysql_file_rename_with_symlink(
13871394
struct PSI_file_locker *locker;
13881395
PSI_file_locker_state state;
13891396
locker= PSI_FILE_CALL(get_thread_file_name_locker)
1390-
(&state, key, PSI_FILE_RENAME, to, &locker);
1397+
(&state, key, PSI_FILE_RENAME, from, &locker);
13911398
if (likely(locker != NULL))
13921399
{
13931400
PSI_FILE_CALL(start_file_wait)(locker, (size_t) 0, src_file, src_line);
13941401
result= my_rename_with_symlink(from, to, flags);
1395-
PSI_FILE_CALL(end_file_wait)(locker, (size_t) 0);
1402+
PSI_FILE_CALL(end_file_rename_wait)(locker, from, to, result);
13961403
return result;
13971404
}
13981405
#endif

‎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, 2013, 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_mdl.h

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
/* Copyright (c) 2012, 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/mysql_memory.h

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
/* Copyright (c) 2012, 2016, 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_ps.h

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1-
/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2014, 2017, 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
@@ -36,6 +43,8 @@
3643
inline_mysql_destroy_prepared_stmt(PREPARED_STMT)
3744
#define MYSQL_REPREPARE_PS(PREPARED_STMT) \
3845
inline_mysql_reprepare_prepared_stmt(PREPARED_STMT)
46+
#define MYSQL_SET_PS_TEXT(PREPARED_STMT, SQLTEXT, SQLTEXT_LENGTH) \
47+
inline_mysql_set_prepared_stmt_text(PREPARED_STMT, SQLTEXT, SQLTEXT_LENGTH)
3948
#else
4049
#define MYSQL_CREATE_PS(IDENTITY, ID, LOCKER, NAME, NAME_LENGTH, SQLTEXT, SQLTEXT_LENGTH) \
4150
NULL
@@ -45,6 +54,8 @@
4554
do {} while (0)
4655
#define MYSQL_REPREPARE_PS(PREPARED_STMT) \
4756
do {} while (0)
57+
#define MYSQL_SET_PS_TEXT(PREPARED_STMT, SQLTEXT, SQLTEXT_LENGTH) \
58+
do {} while (0)
4859
#endif
4960

5061
#ifdef HAVE_PSI_PS_INTERFACE
@@ -83,6 +94,17 @@ inline_mysql_reprepare_prepared_stmt(PSI_prepared_stmt *prepared_stmt)
8394
if (prepared_stmt != NULL)
8495
PSI_PS_CALL(reprepare_prepared_stmt)(prepared_stmt);
8596
}
97+
98+
static inline void
99+
inline_mysql_set_prepared_stmt_text(PSI_prepared_stmt *prepared_stmt,
100+
const char *text,
101+
uint text_len)
102+
{
103+
if (prepared_stmt != NULL)
104+
{
105+
PSI_PS_CALL(set_prepared_stmt_text)(prepared_stmt, text, text_len);
106+
}
107+
}
86108
#endif
87109

88110
#endif

‎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, 2016, 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_sp.h

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
/* Copyright (c) 2013, 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_stage.h

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
/* Copyright (c) 2010, 2014, 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, 2014, 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)