Skip to content

Commit f7621f1

Browse files
vuvovavuvova
committed
rename mysql.user and mysql.db column
Truncate_versioning_priv->Delete_history_priv because the command and the privilege were renamed
1 parent f51ecfe commit f7621f1

20 files changed

+100
-98
lines changed

‎mysql-test/r/alter_user.result‎

Lines changed: 14 additions & 14 deletions
Large diffs are not rendered by default.

‎mysql-test/r/create_user.result‎

Lines changed: 12 additions & 12 deletions
Large diffs are not rendered by default.

‎mysql-test/r/grant.result‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Create_user_priv N
4949
Event_priv N
5050
Trigger_priv N
5151
Create_tablespace_priv N
52-
Truncate_versioning_privN
52+
Delete_history_privN
5353
ssl_type SPECIFIED
5454
ssl_cipher EDH-RSA-DES-CBC3-SHA
5555
x509_issuer
@@ -125,7 +125,7 @@ Create_user_priv N
125125
Event_priv N
126126
Trigger_priv N
127127
Create_tablespace_priv N
128-
Truncate_versioning_privN
128+
Delete_history_privN
129129
ssl_type
130130
ssl_cipher
131131
x509_issuer
@@ -177,7 +177,7 @@ Create_user_priv N
177177
Event_priv N
178178
Trigger_priv N
179179
Create_tablespace_priv N
180-
Truncate_versioning_privN
180+
Delete_history_privN
181181
ssl_type
182182
ssl_cipher
183183
x509_issuer
@@ -773,7 +773,7 @@ flush privileges;
773773
use test;
774774
set @user123="non-existent";
775775
select * from mysql.db where user=@user123;
776-
Host Db User Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Grant_priv References_priv Index_priv Alter_priv Create_tmp_table_priv Lock_tables_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Execute_priv Event_priv Trigger_privTruncate_versioning_priv
776+
Host Db User Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Grant_priv References_priv Index_priv Alter_priv Create_tmp_table_priv Lock_tables_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Execute_priv Event_priv Trigger_privDelete_history_priv
777777
set names koi8r;
778778
create database ��;
779779
grant select on ��.* to root@localhost;

‎mysql-test/r/information_schema.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ Lock_tables_priv select,insert,update,references
749749
Show_view_priv select,insert,update,references
750750
Create_routine_priv select,insert,update,references
751751
Alter_routine_priv select,insert,update,references
752-
Truncate_versioning_privselect,insert,update,references
752+
Delete_history_privselect,insert,update,references
753753
max_questions select,insert,update,references
754754
max_connections select,insert,update,references
755755
max_user_connections select,insert,update,references

‎mysql-test/r/lowercase_table_grant.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Grants for mysqltest_1@localhost
77
GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
88
GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_1'@'localhost'
99
select * from db where user = 'mysqltest_1';
10-
Host Db User Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Grant_priv References_priv Index_priv Alter_priv Create_tmp_table_priv Lock_tables_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Execute_priv Event_priv Trigger_privTruncate_versioning_priv
10+
Host Db User Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Grant_priv References_priv Index_priv Alter_priv Create_tmp_table_priv Lock_tables_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Execute_priv Event_priv Trigger_privDelete_history_priv
1111
localhost mysqltest mysqltest_1 Y Y Y Y Y Y N Y Y Y Y Y Y Y Y Y Y Y Y Y
1212
update db set db = 'MYSQLtest' where db = 'mysqltest' and user = 'mysqltest_1' and host = 'localhost';
1313
flush privileges;
@@ -16,7 +16,7 @@ Grants for mysqltest_1@localhost
1616
GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
1717
GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_1'@'localhost'
1818
select * from db where user = 'mysqltest_1';
19-
Host Db User Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Grant_priv References_priv Index_priv Alter_priv Create_tmp_table_priv Lock_tables_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Execute_priv Event_priv Trigger_privTruncate_versioning_priv
19+
Host Db User Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Grant_priv References_priv Index_priv Alter_priv Create_tmp_table_priv Lock_tables_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Execute_priv Event_priv Trigger_privDelete_history_priv
2020
localhost MYSQLtest mysqltest_1 Y Y Y Y Y Y N Y Y Y Y Y Y Y Y Y Y Y Y Y
2121
delete from db where db = 'MYSQLtest' and user = 'mysqltest_1' and host = 'localhost';
2222
flush privileges;

‎mysql-test/r/mysql_upgrade.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ flush privileges;
580580
CREATE USER 'user3'@'%';
581581
GRANT USAGE ON *.* TO 'user3'@'%';
582582
GRANT ALL PRIVILEGES ON `roelt`.`test2` TO 'user3'@'%';
583-
alter table mysql.user drop column Truncate_versioning_priv;
583+
alter table mysql.user drop column Delete_history_priv;
584584
flush privileges;
585585
Run mysql_upgrade with all privileges on a user
586586
flush privileges;

‎mysql-test/r/no_password_column-mdev-11170.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Create_user_priv enum('N','Y') NO N
4242
Event_priv enum('N','Y') NO N
4343
Trigger_priv enum('N','Y') NO N
4444
Create_tablespace_priv enum('N','Y') NO N
45-
Truncate_versioning_privenum('N','Y') NO N
45+
Delete_history_privenum('N','Y') NO N
4646
ssl_type enum('','ANY','X509','SPECIFIED') NO
4747
ssl_cipher blob NO NULL
4848
x509_issuer blob NO NULL

‎mysql-test/r/sql_mode.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ SET SESSION SQL_MODE = @OLD_SQL_MODE;
531531
DROP USER 'user_no_PCTFL'@'localhost';
532532
FLUSH PRIVILEGES;
533533
SELECT * FROM mysql.db WHERE Host = 'localhost' AND User LIKE 'user_%PCTFL';
534-
Host Db User Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Grant_priv References_priv Index_priv Alter_priv Create_tmp_table_priv Lock_tables_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Execute_priv Event_priv Trigger_privTruncate_versioning_priv
534+
Host Db User Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Grant_priv References_priv Index_priv Alter_priv Create_tmp_table_priv Lock_tables_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Execute_priv Event_priv Trigger_privDelete_history_priv
535535
SELECT * FROM mysql.tables_priv WHERE Host = 'localhost' AND User LIKE 'user_%PCTFL';
536536
Host Db User Table_name Grantor Timestamp Table_priv Column_priv
537537
SELECT * FROM mysql.columns_priv WHERE Host = 'localhost' AND User LIKE 'user_%PCTFL';

‎mysql-test/r/system_mysql_db.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ db CREATE TABLE `db` (
5656
`Execute_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
5757
`Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
5858
`Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
59-
`Truncate_versioning_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
59+
`Delete_history_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
6060
PRIMARY KEY (`Host`,`Db`,`User`),
6161
KEY `User` (`User`)
6262
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Database privileges'
@@ -120,7 +120,7 @@ user CREATE TABLE `user` (
120120
`Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
121121
`Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
122122
`Create_tablespace_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
123-
`Truncate_versioning_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
123+
`Delete_history_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
124124
`ssl_type` enum('','ANY','X509','SPECIFIED') CHARACTER SET utf8 NOT NULL DEFAULT '',
125125
`ssl_cipher` blob NOT NULL,
126126
`x509_issuer` blob NOT NULL,

‎mysql-test/r/system_mysql_db_fix40123.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ db CREATE TABLE `db` (
5656
`Execute_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
5757
`Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
5858
`Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
59-
`Truncate_versioning_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
59+
`Delete_history_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
6060
PRIMARY KEY (`Host`,`Db`,`User`),
6161
KEY `User` (`User`)
6262
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Database privileges'
@@ -120,7 +120,7 @@ user CREATE TABLE `user` (
120120
`Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
121121
`Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
122122
`Create_tablespace_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
123-
`Truncate_versioning_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
123+
`Delete_history_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
124124
`ssl_type` enum('','ANY','X509','SPECIFIED') CHARACTER SET utf8 NOT NULL DEFAULT '',
125125
`ssl_cipher` blob NOT NULL,
126126
`x509_issuer` blob NOT NULL,

0 commit comments

Comments
 (0)