Skip to content

Commit

Permalink
[mysql_thread_pool] Bump P_S version for processlist and threads tabl…
Browse files Browse the repository at this point in the history
…es changes

Summary:
The previous change D52988122 missed the version bump. As a result, the data dictionary on prod instances doesn't get updated and new columns do not show up.

Squash with D52988122.

Test Plan: MTR

Reviewers: luqun, herman, saumitr, prerit

Reviewed By: saumitr

Differential Revision: https://phabricator.intern.facebook.com/D56020631

Tasks: T171902939
  • Loading branch information
george-reynya committed Apr 21, 2024
1 parent 992265e commit 81e7b50
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
4 changes: 3 additions & 1 deletion mysql-test/suite/perfschema/r/dd_version_check.result
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
"Checking the data dictionary properties ..."
SUBSTRING_INDEX(SUBSTRING(properties, LOCATE('PS_VERSION', properties), 30), ';', 1)
PS_VERSION=80032024
PS_VERSION=80032025
"Checking the performance schema database structure ..."
CHECK STATUS
The tables in the performance_schema were last changed in MySQL 8.0.32-025
6 changes: 5 additions & 1 deletion mysql-test/suite/perfschema/t/dd_version_check.test
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ insert into test.pfs_published_schema
values("MySQL 8.0.32-024",
"bd65e8991bc90430fbb0b97786465bc39277dfd462dc7e2b2ce2e0735f9e2146");

insert into test.pfs_published_schema
values("MySQL 8.0.32-025",
"a7874df1933a0637502cc6e32c9c054e998a9195d2c6178b81fdb9d477373da0");

create table test.pfs_check_table
(id int NOT NULL AUTO_INCREMENT,
t text NOT NULL,
Expand Down Expand Up @@ -261,7 +265,7 @@ delimiter ;$$

--echo "Checking the performance schema database structure ..."

# call test.pfs_check_proc();
call test.pfs_check_proc();

# Debug
# select count(*) from test.pfs_check_table;
Expand Down
2 changes: 1 addition & 1 deletion storage/perfschema/ha_perfschema.cc
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
*/

static_assert((PFS_DD_VERSION <= MYSQL_VERSION_ID) ||
((PFS_DD_VERSION == 80032024) && (MYSQL_VERSION_ID == 80032)),
((PFS_DD_VERSION == 80032025) && (MYSQL_VERSION_ID == 80032)),
"This release can not use a version number from the future");

class KEY;
Expand Down
5 changes: 4 additions & 1 deletion storage/perfschema/pfs_dd_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -330,10 +330,13 @@
80032-024:
- Add new table SQL_PLANS for capturing query execution PLANS
80032-025:
- Add CPU_USAGE and DELAY_TOTAL columns to P_S.processlist and P_S.threads.
The last three digits reprents Facebook specific MySQL Schema changes.
Version published is now 80032-024. i.e. 8.0.32 Facebook schema change no. 24.
*/

static const uint PFS_DD_VERSION = 80032024;
static const uint PFS_DD_VERSION = 80032025;

#endif /* PFS_DD_VERSION_H */

0 comments on commit 81e7b50

Please sign in to comment.