Skip to content

Commit 7ba06c3

Browse files
Dyre Tjeldvolldahlerlend
Dyre Tjeldvoll
authored and
dahlerlend
committed
Bug#27472087: Post-push fix. Replace lower-case p in partition tablespace names caused by l_c_t_n
Change-Id: Iffd03b6ea98b61c8efe1f733724cf2ef9091c39f (cherry picked from commit d87122f5da1b8b5fa91937e55d277c30fa1d2e01)
1 parent 42d85e6 commit 7ba06c3

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

‎mysql-test/r/mdl_tablespace.result

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,12 +1099,13 @@ CREATE TABLE part1(a INT) PARTITION BY HASH (a) PARTITIONS 10;
10991099
CREATE TABLE part2(a INT) PARTITION BY HASH (a) PARTITIONS 10;
11001100
LOCK TABLES part1 WRITE;
11011101
### Locks held ###
1102-
SELECT OBJECT_TYPE, OBJECT_NAME, LOCK_TYPE, LOCK_DURATION, LOCK_STATUS
1102+
SELECT OBJECT_TYPE, REPLACE(OBJECT_NAME, '#p#', '#P#'), LOCK_TYPE,
1103+
LOCK_DURATION, LOCK_STATUS
11031104
FROM performance_schema.metadata_locks
11041105
WHERE OBJECT_TYPE = 'table' AND OBJECT_SCHEMA = 'test' OR
11051106
OBJECT_TYPE = 'tablespace'
11061107
ORDER BY OBJECT_NAME;
1107-
OBJECT_TYPE OBJECT_NAME LOCK_TYPE LOCK_DURATION LOCK_STATUS
1108+
OBJECT_TYPE REPLACE(OBJECT_NAME, '#p#', '#P#') LOCK_TYPE LOCK_DURATION LOCK_STATUS
11081109
TABLE part1 SHARED_NO_READ_WRITE TRANSACTION GRANTED
11091110
TABLESPACE test/part1#P#p0 INTENTION_EXCLUSIVE TRANSACTION GRANTED
11101111
TABLESPACE test/part1#P#p1 INTENTION_EXCLUSIVE TRANSACTION GRANTED
@@ -1119,12 +1120,13 @@ TABLESPACE test/part1#P#p9 INTENTION_EXCLUSIVE TRANSACTION GRANTED
11191120
###
11201121
ALTER TABLE part1 RENAME TO part1_tmp;
11211122
### Locks held ###
1122-
SELECT OBJECT_TYPE, OBJECT_NAME, LOCK_TYPE, LOCK_DURATION, LOCK_STATUS
1123+
SELECT OBJECT_TYPE, REPLACE(OBJECT_NAME, '#p#', '#P#'), LOCK_TYPE,
1124+
LOCK_DURATION, LOCK_STATUS
11231125
FROM performance_schema.metadata_locks
11241126
WHERE OBJECT_TYPE = 'table' AND OBJECT_SCHEMA = 'test' OR
11251127
OBJECT_TYPE = 'tablespace'
11261128
ORDER BY OBJECT_NAME;
1127-
OBJECT_TYPE OBJECT_NAME LOCK_TYPE LOCK_DURATION LOCK_STATUS
1129+
OBJECT_TYPE REPLACE(OBJECT_NAME, '#p#', '#P#') LOCK_TYPE LOCK_DURATION LOCK_STATUS
11281130
TABLE part1_tmp EXCLUSIVE TRANSACTION GRANTED
11291131
TABLESPACE test/part1_tmp#P#p0 EXCLUSIVE TRANSACTION GRANTED
11301132
TABLESPACE test/part1_tmp#P#p1 EXCLUSIVE TRANSACTION GRANTED
@@ -1139,12 +1141,13 @@ TABLESPACE test/part1_tmp#P#p9 EXCLUSIVE TRANSACTION GRANTED
11391141
###
11401142
ALTER TABLE part2 RENAME TO part1;
11411143
### Locks held ###
1142-
SELECT OBJECT_TYPE, OBJECT_NAME, LOCK_TYPE, LOCK_DURATION, LOCK_STATUS
1144+
SELECT OBJECT_TYPE, REPLACE(OBJECT_NAME, '#p#', '#P#'), LOCK_TYPE,
1145+
LOCK_DURATION, LOCK_STATUS
11431146
FROM performance_schema.metadata_locks
11441147
WHERE OBJECT_TYPE = 'table' AND OBJECT_SCHEMA = 'test' OR
11451148
OBJECT_TYPE = 'tablespace'
11461149
ORDER BY OBJECT_NAME;
1147-
OBJECT_TYPE OBJECT_NAME LOCK_TYPE LOCK_DURATION LOCK_STATUS
1150+
OBJECT_TYPE REPLACE(OBJECT_NAME, '#p#', '#P#') LOCK_TYPE LOCK_DURATION LOCK_STATUS
11481151
TABLE part1_tmp EXCLUSIVE TRANSACTION GRANTED
11491152
TABLESPACE test/part1_tmp#P#p0 EXCLUSIVE TRANSACTION GRANTED
11501153
TABLESPACE test/part1_tmp#P#p1 EXCLUSIVE TRANSACTION GRANTED

‎mysql-test/t/mdl_tablespace.test

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1562,7 +1562,8 @@ CREATE TABLE part2(a INT) PARTITION BY HASH (a) PARTITIONS 10;
15621562
LOCK TABLES part1 WRITE;
15631563

15641564
--echo ### Locks held ###
1565-
SELECT OBJECT_TYPE, OBJECT_NAME, LOCK_TYPE, LOCK_DURATION, LOCK_STATUS
1565+
SELECT OBJECT_TYPE, REPLACE(OBJECT_NAME, '#p#', '#P#'), LOCK_TYPE,
1566+
LOCK_DURATION, LOCK_STATUS
15661567
FROM performance_schema.metadata_locks
15671568
WHERE OBJECT_TYPE = 'table' AND OBJECT_SCHEMA = 'test' OR
15681569
OBJECT_TYPE = 'tablespace'
@@ -1572,7 +1573,8 @@ ORDER BY OBJECT_NAME;
15721573
ALTER TABLE part1 RENAME TO part1_tmp;
15731574

15741575
--echo ### Locks held ###
1575-
SELECT OBJECT_TYPE, OBJECT_NAME, LOCK_TYPE, LOCK_DURATION, LOCK_STATUS
1576+
SELECT OBJECT_TYPE, REPLACE(OBJECT_NAME, '#p#', '#P#'), LOCK_TYPE,
1577+
LOCK_DURATION, LOCK_STATUS
15761578
FROM performance_schema.metadata_locks
15771579
WHERE OBJECT_TYPE = 'table' AND OBJECT_SCHEMA = 'test' OR
15781580
OBJECT_TYPE = 'tablespace'
@@ -1583,7 +1585,8 @@ ORDER BY OBJECT_NAME;
15831585
ALTER TABLE part2 RENAME TO part1;
15841586

15851587
--echo ### Locks held ###
1586-
SELECT OBJECT_TYPE, OBJECT_NAME, LOCK_TYPE, LOCK_DURATION, LOCK_STATUS
1588+
SELECT OBJECT_TYPE, REPLACE(OBJECT_NAME, '#p#', '#P#'), LOCK_TYPE,
1589+
LOCK_DURATION, LOCK_STATUS
15871590
FROM performance_schema.metadata_locks
15881591
WHERE OBJECT_TYPE = 'table' AND OBJECT_SCHEMA = 'test' OR
15891592
OBJECT_TYPE = 'tablespace'

0 commit comments

Comments
 (0)