Skip to content

Commit dd13d3d

Browse files
Do not create mysql.password_history in MyRocks if MyRocks is the DDSE (#1381)
Summary: This table is a system table, not a DD table. Eventually we'll create it in MyRocks, but for now the mix-up between system and DD tables is confusing, and the source code counterpart allowing the creation of password_history in MyRocks was already reverted in #1333 Pull Request resolved: #1381 Differential Revision: D50843849 fbshipit-source-id: 33d6da120d4e9da58ae6bdae64f3b1f2e918c6c7
1 parent 79e5144 commit dd13d3d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/mysql_system_tables.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ SET @cmd = "CREATE TABLE IF NOT EXISTS password_history
185185
User CHAR(80) BINARY DEFAULT '' NOT NULL,
186186
Password_timestamp TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
187187
Password TEXT,";
188-
SET @str = IF(@ddse = 'ROCKSDB', CONCAT(@cmd, "PRIMARY KEY(Host, User, Password_timestamp))", " engine=ROCKSDB CHARACTER SET utf8 COLLATE utf8_bin comment='Password history for user accounts'"), CONCAT(@cmd, "PRIMARY KEY(Host, User, Password_timestamp DESC))", " engine=InnoDB STATS_PERSISTENT=0 CHARACTER SET utf8 COLLATE utf8_bin comment='Password history for user accounts' ROW_FORMAT=DYNAMIC TABLESPACE=mysql", " ENCRYPTION='", @is_mysql_encrypted, "'"));
188+
SET @str = CONCAT(@cmd, "PRIMARY KEY(Host, User, Password_timestamp DESC))", " engine=InnoDB STATS_PERSISTENT=0 CHARACTER SET utf8 COLLATE utf8_bin comment='Password history for user accounts' ROW_FORMAT=DYNAMIC TABLESPACE=mysql", " ENCRYPTION='", @is_mysql_encrypted, "'");
189189
PREPARE stmt FROM @str;
190190
EXECUTE stmt;
191191
DROP PREPARE stmt;

0 commit comments

Comments
 (0)