Skip to content

Commit 47f80fc

Browse files
ssorumgarddahlerlend
authored andcommitted
Bug #27690593: CHANGE TYPE OF MYSQL.DD_PROPERTIES.PROPERTIES TO MEDIUMBLOB
Since the table definition of 'mysql.dd_properties' should not change after 8.0 GA, this patch is needed to avoid a future dependency on utf8. Change-Id: I32d968cc1c1d95ab1ed0f96f8bdbfa8243ac6390
1 parent c75ba2c commit 47f80fc

File tree

5 files changed

+4
-4
lines changed

5 files changed

+4
-4
lines changed

mysql-test/r/dd_schema_definition_debug.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ columns CREATE TABLE `columns` (
268268
SHOW CREATE TABLE mysql.dd_properties;
269269
Table Create Table
270270
dd_properties CREATE TABLE `dd_properties` (
271-
`properties` mediumtext COLLATE utf8_bin
271+
`properties` mediumblob
272272
) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC
273273
SHOW CREATE TABLE mysql.events;
274274
Table Create Table
-5 Bytes
Binary file not shown.
-6 Bytes
Binary file not shown.

mysql-test/t/dd_schema_definition_debug.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,10 +547,10 @@ INSERT INTO dd_published_schema
547547
'f607ab08b2d2b2d93d8867ad75116655d9c942647245d7846be440ec916c440f');
548548
INSERT INTO dd_published_schema
549549
VALUES ('80011', 0,
550-
'78718cc3e520fdfcaa82ec1b21d11d4b604b27c3f97a9f3ec4ed214a7ba0232c');
550+
'e849364aeb724ff89f9d4d01bea6e933b9f0ef5087b4098a83acbe584a2f0702');
551551
INSERT INTO dd_published_schema
552552
VALUES ('80011', 1,
553-
'56729f3744c0f7400aa45ffa02af97676a27db7903ae79dc3660c5e32c016de9');
553+
'ac9e620d1fcd8389cce7660c7f7bbc0acbe3a31fd52799ef8816981bf6de73fd');
554554

555555
SELECT IFNULL(CONCAT('The schema checksum corresponds to DD version ',
556556
version, '.'),

sql/dd/impl/tables/dd_properties.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ DD_properties::DD_properties() : m_properties() {
5959
m_target_def.set_table_name("dd_properties");
6060

6161
m_target_def.add_field(FIELD_PROPERTIES, "FIELD_PROPERTIES",
62-
"properties MEDIUMTEXT");
62+
"properties MEDIUMBLOB");
6363

6464
m_target_def.add_populate_statement(
6565
"INSERT INTO dd_properties (properties)"

0 commit comments

Comments
 (0)