Skip to content

Commit b69f9b3

Browse files
gkodinovgkodinov
committed
Bug #57916: Fix the naming of the proxy_priv table
1. Fixed the name of the table to proxies_priv 2. Fixed the column names to be of the form Capitalized_lowecarse instead of Capitalized_Capitalized 3. Added Timestamp and Grantor columns 4. Added tests to plugin_auth to check the table structure 5. Updated the existing tests
1 parent 3a7d79d commit b69f9b3

24 files changed

+137
-95
lines changed

‎mysql-test/r/1st.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ndb_binlog_index
2121
plugin
2222
proc
2323
procs_priv
24-
proxy_priv
24+
proxies_priv
2525
servers
2626
slow_log
2727
tables_priv

‎mysql-test/r/connect.result

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ndb_binlog_index
1515
plugin
1616
proc
1717
procs_priv
18-
proxy_priv
18+
proxies_priv
1919
servers
2020
slow_log
2121
tables_priv
@@ -49,7 +49,7 @@ ndb_binlog_index
4949
plugin
5050
proc
5151
procs_priv
52-
proxy_priv
52+
proxies_priv
5353
servers
5454
slow_log
5555
tables_priv
@@ -91,7 +91,7 @@ ndb_binlog_index
9191
plugin
9292
proc
9393
procs_priv
94-
proxy_priv
94+
proxies_priv
9595
servers
9696
slow_log
9797
tables_priv

‎mysql-test/r/information_schema.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ host
8888
plugin
8989
proc
9090
procs_priv
91-
proxy_priv
91+
proxies_priv
9292
servers
9393
slow_log
9494
tables_priv

‎mysql-test/r/log_tables_upgrade.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ mysql.ndb_binlog_index OK
2727
mysql.plugin OK
2828
mysql.proc OK
2929
mysql.procs_priv OK
30-
mysql.proxy_priv OK
30+
mysql.proxies_priv OK
3131
mysql.renamed_general_log OK
3232
mysql.servers OK
3333
mysql.slow_log OK

‎mysql-test/r/mysql_upgrade.result

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ mysql.ndb_binlog_index OK
1515
mysql.plugin OK
1616
mysql.proc OK
1717
mysql.procs_priv OK
18-
mysql.proxy_priv OK
18+
mysql.proxies_priv OK
1919
mysql.servers OK
2020
mysql.slow_log OK
2121
mysql.tables_priv OK
@@ -44,7 +44,7 @@ mysql.ndb_binlog_index OK
4444
mysql.plugin OK
4545
mysql.proc OK
4646
mysql.procs_priv OK
47-
mysql.proxy_priv OK
47+
mysql.proxies_priv OK
4848
mysql.servers OK
4949
mysql.slow_log OK
5050
mysql.tables_priv OK
@@ -73,7 +73,7 @@ mysql.ndb_binlog_index OK
7373
mysql.plugin OK
7474
mysql.proc OK
7575
mysql.procs_priv OK
76-
mysql.proxy_priv OK
76+
mysql.proxies_priv OK
7777
mysql.servers OK
7878
mysql.slow_log OK
7979
mysql.tables_priv OK
@@ -104,7 +104,7 @@ mysql.ndb_binlog_index OK
104104
mysql.plugin OK
105105
mysql.proc OK
106106
mysql.procs_priv OK
107-
mysql.proxy_priv OK
107+
mysql.proxies_priv OK
108108
mysql.servers OK
109109
mysql.slow_log OK
110110
mysql.tables_priv OK
@@ -139,7 +139,7 @@ mysql.ndb_binlog_index OK
139139
mysql.plugin OK
140140
mysql.proc OK
141141
mysql.procs_priv OK
142-
mysql.proxy_priv OK
142+
mysql.proxies_priv OK
143143
mysql.servers OK
144144
mysql.slow_log OK
145145
mysql.tables_priv OK
@@ -177,7 +177,7 @@ mysql.ndb_binlog_index OK
177177
mysql.plugin OK
178178
mysql.proc OK
179179
mysql.procs_priv OK
180-
mysql.proxy_priv OK
180+
mysql.proxies_priv OK
181181
mysql.servers OK
182182
mysql.slow_log OK
183183
mysql.tables_priv OK

‎mysql-test/r/mysql_upgrade_ssl.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ mysql.ndb_binlog_index OK
1717
mysql.plugin OK
1818
mysql.proc OK
1919
mysql.procs_priv OK
20-
mysql.proxy_priv OK
20+
mysql.proxies_priv OK
2121
mysql.servers OK
2222
mysql.slow_log OK
2323
mysql.tables_priv OK

‎mysql-test/r/mysqlcheck.result

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ mysql.ndb_binlog_index OK
1818
mysql.plugin OK
1919
mysql.proc OK
2020
mysql.procs_priv OK
21-
mysql.proxy_priv OK
21+
mysql.proxies_priv OK
2222
mysql.servers OK
2323
mysql.slow_log
2424
note : The storage engine for the table doesn't support analyze
@@ -46,7 +46,7 @@ mysql.ndb_binlog_index OK
4646
mysql.plugin OK
4747
mysql.proc OK
4848
mysql.procs_priv OK
49-
mysql.proxy_priv OK
49+
mysql.proxies_priv OK
5050
mysql.servers OK
5151
mysql.slow_log
5252
note : The storage engine for the table doesn't support optimize
@@ -72,7 +72,7 @@ mysql.ndb_binlog_index OK
7272
mysql.plugin OK
7373
mysql.proc OK
7474
mysql.procs_priv OK
75-
mysql.proxy_priv OK
75+
mysql.proxies_priv OK
7676
mysql.servers OK
7777
mysql.slow_log
7878
note : The storage engine for the table doesn't support analyze
@@ -98,7 +98,7 @@ mysql.ndb_binlog_index Table is already up to date
9898
mysql.plugin Table is already up to date
9999
mysql.proc Table is already up to date
100100
mysql.procs_priv Table is already up to date
101-
mysql.proxy_priv Table is already up to date
101+
mysql.proxies_priv Table is already up to date
102102
mysql.servers Table is already up to date
103103
mysql.slow_log
104104
note : The storage engine for the table doesn't support optimize

‎mysql-test/r/plugin_auth.result

+22-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,26 @@ test_plugin_server plug_dest
1111
## test plugin auth
1212
ERROR 28000: Access denied for user 'plug'@'localhost' (using password: YES)
1313
GRANT PROXY ON plug_dest TO plug;
14+
test proxies_priv columns
15+
SELECT * FROM mysql.proxies_priv;
16+
Host User Proxied_host Proxied_user With_grant Grantor Timestamp
17+
localhost root 1 xx
18+
unknown root 1 xx
19+
% plug % plug_dest 0 root@localhost xx
20+
test mysql.proxies_priv;
21+
SHOW CREATE TABLE mysql.proxies_priv;
22+
Table Create Table
23+
proxies_priv CREATE TABLE `proxies_priv` (
24+
`Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
25+
`User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '',
26+
`Proxied_host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
27+
`Proxied_user` char(16) COLLATE utf8_bin NOT NULL DEFAULT '',
28+
`With_grant` tinyint(1) NOT NULL DEFAULT '0',
29+
`Grantor` char(77) COLLATE utf8_bin NOT NULL DEFAULT '',
30+
`Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
31+
PRIMARY KEY (`Host`,`User`,`Proxied_host`,`Proxied_user`),
32+
KEY `Grantor` (`Grantor`)
33+
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='User proxy privileges'
1434
select USER(),CURRENT_USER();
1535
USER() CURRENT_USER()
1636
plug@localhost plug_dest@%
@@ -146,8 +166,8 @@ Grants for test_drop@localhost
146166
GRANT USAGE ON *.* TO 'test_drop'@'localhost'
147167
GRANT PROXY ON 'future_user'@'%' TO 'test_drop'@'localhost'
148168
DROP USER test_drop@localhost;
149-
SELECT * FROM mysql.proxy_priv WHERE Host = 'test_drop' AND User = 'localhost';
150-
Host User Proxied_Host Proxied_User With_Grant
169+
SELECT * FROM mysql.proxies_priv WHERE Host = 'test_drop' AND User = 'localhost';
170+
Host User Proxied_host Proxied_user With_grant Grantor Timestamp
151171
DROP USER proxy_admin;
152172
DROP USER grant_plug,grant_plug_dest,grant_plug_dest2;
153173
## END GRANT PROXY tests

‎mysql-test/r/system_mysql_db.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ndb_binlog_index
1414
plugin
1515
proc
1616
procs_priv
17-
proxy_priv
17+
proxies_priv
1818
servers
1919
slow_log
2020
tables_priv

‎mysql-test/suite/funcs_1/r/is_columns_mysql.result

+14-10
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,13 @@ def mysql procs_priv Routine_name 4 NO char 64 192 NULL NULL utf8 utf8_general_
134134
def mysql procs_priv Routine_type 5 NULL NO enum 9 27 NULL NULL utf8 utf8_bin enum('FUNCTION','PROCEDURE') PRI select,insert,update,references
135135
def mysql procs_priv Timestamp 8 CURRENT_TIMESTAMP NO timestamp NULL NULL NULL NULL NULL NULL timestamp on update CURRENT_TIMESTAMP select,insert,update,references
136136
def mysql procs_priv User 3 NO char 16 48 NULL NULL utf8 utf8_bin char(16) PRI select,insert,update,references
137-
def mysql proxy_priv Host 1 NO char 60 180 NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references
138-
def mysql proxy_priv Proxied_Host 3 NO char 16 48 NULL NULL utf8 utf8_bin char(16) PRI select,insert,update,references
139-
def mysql proxy_priv Proxied_User 4 NO char 60 180 NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references
140-
def mysql proxy_priv User 2 NO char 16 48 NULL NULL utf8 utf8_bin char(16) PRI select,insert,update,references
141-
def mysql proxy_priv With_Grant 5 0 NO tinyint NULL NULL 3 0 NULL NULL tinyint(1) select,insert,update,references
137+
def mysql proxies_priv Grantor 6 NO char 77 231 NULL NULL utf8 utf8_bin char(77) MUL select,insert,update,references
138+
def mysql proxies_priv Host 1 NO char 60 180 NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references
139+
def mysql proxies_priv Proxied_host 3 NO char 60 180 NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references
140+
def mysql proxies_priv Proxied_user 4 NO char 16 48 NULL NULL utf8 utf8_bin char(16) PRI select,insert,update,references
141+
def mysql proxies_priv Timestamp 7 CURRENT_TIMESTAMP NO timestamp NULL NULL NULL NULL NULL NULL timestamp on update CURRENT_TIMESTAMP select,insert,update,references
142+
def mysql proxies_priv User 2 NO char 16 48 NULL NULL utf8 utf8_bin char(16) PRI select,insert,update,references
143+
def mysql proxies_priv With_grant 5 0 NO tinyint NULL NULL 3 0 NULL NULL tinyint(1) select,insert,update,references
142144
def mysql servers Db 3 NO char 64 192 NULL NULL utf8 utf8_general_ci char(64) select,insert,update,references
143145
def mysql servers Host 2 NO char 64 192 NULL NULL utf8 utf8_general_ci char(64) select,insert,update,references
144146
def mysql servers Owner 9 NO char 64 192 NULL NULL utf8 utf8_general_ci char(64) select,insert,update,references
@@ -425,11 +427,13 @@ NULL mysql proc modified timestamp NULL NULL NULL NULL timestamp
425427
3.0000 mysql procs_priv Grantor char 77 231 utf8 utf8_bin char(77)
426428
3.0000 mysql procs_priv Proc_priv set 27 81 utf8 utf8_general_ci set('Execute','Alter Routine','Grant')
427429
NULL mysql procs_priv Timestamp timestamp NULL NULL NULL NULL timestamp
428-
3.0000 mysql proxy_priv Host char 60 180 utf8 utf8_bin char(60)
429-
3.0000 mysql proxy_priv User char 16 48 utf8 utf8_bin char(16)
430-
3.0000 mysql proxy_priv Proxied_Host char 16 48 utf8 utf8_bin char(16)
431-
3.0000 mysql proxy_priv Proxied_User char 60 180 utf8 utf8_bin char(60)
432-
NULL mysql proxy_priv With_Grant tinyint NULL NULL NULL NULL tinyint(1)
430+
3.0000 mysql proxies_priv Host char 60 180 utf8 utf8_bin char(60)
431+
3.0000 mysql proxies_priv User char 16 48 utf8 utf8_bin char(16)
432+
3.0000 mysql proxies_priv Proxied_host char 60 180 utf8 utf8_bin char(60)
433+
3.0000 mysql proxies_priv Proxied_user char 16 48 utf8 utf8_bin char(16)
434+
NULL mysql proxies_priv With_grant tinyint NULL NULL NULL NULL tinyint(1)
435+
3.0000 mysql proxies_priv Grantor char 77 231 utf8 utf8_bin char(77)
436+
NULL mysql proxies_priv Timestamp timestamp NULL NULL NULL NULL timestamp
433437
3.0000 mysql servers Server_name char 64 192 utf8 utf8_general_ci char(64)
434438
3.0000 mysql servers Host char 64 192 utf8 utf8_general_ci char(64)
435439
3.0000 mysql servers Db char 64 192 utf8 utf8_general_ci char(64)

‎mysql-test/suite/funcs_1/r/is_key_column_usage.result

+4-4
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ def mysql PRIMARY def mysql procs_priv Db
106106
def mysql PRIMARY def mysql procs_priv User
107107
def mysql PRIMARY def mysql procs_priv Routine_name
108108
def mysql PRIMARY def mysql procs_priv Routine_type
109-
def mysql PRIMARY def mysql proxy_priv Host
110-
def mysql PRIMARY def mysql proxy_priv User
111-
def mysql PRIMARY def mysql proxy_priv Proxied_Host
112-
def mysql PRIMARY def mysql proxy_priv Proxied_User
109+
def mysql PRIMARY def mysql proxies_priv Host
110+
def mysql PRIMARY def mysql proxies_priv User
111+
def mysql PRIMARY def mysql proxies_priv Proxied_host
112+
def mysql PRIMARY def mysql proxies_priv Proxied_user
113113
def mysql PRIMARY def mysql servers Server_name
114114
def mysql PRIMARY def mysql tables_priv Host
115115
def mysql PRIMARY def mysql tables_priv Db

‎mysql-test/suite/funcs_1/r/is_statistics.result

+5-4
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,11 @@ def mysql procs_priv mysql PRIMARY
118118
def mysql procs_priv mysql PRIMARY
119119
def mysql procs_priv mysql PRIMARY
120120
def mysql procs_priv mysql Grantor
121-
def mysql proxy_priv mysql PRIMARY
122-
def mysql proxy_priv mysql PRIMARY
123-
def mysql proxy_priv mysql PRIMARY
124-
def mysql proxy_priv mysql PRIMARY
121+
def mysql proxies_priv mysql PRIMARY
122+
def mysql proxies_priv mysql PRIMARY
123+
def mysql proxies_priv mysql PRIMARY
124+
def mysql proxies_priv mysql PRIMARY
125+
def mysql proxies_priv mysql Grantor
125126
def mysql servers mysql PRIMARY
126127
def mysql tables_priv mysql PRIMARY
127128
def mysql tables_priv mysql PRIMARY

‎mysql-test/suite/funcs_1/r/is_statistics_mysql.result

+5-4
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,11 @@ def mysql procs_priv 0 mysql PRIMARY 2 Db A #CARD# NULL NULL BTREE
4040
def mysql procs_priv 0 mysql PRIMARY 3 User A #CARD# NULL NULL BTREE
4141
def mysql procs_priv 0 mysql PRIMARY 4 Routine_name A #CARD# NULL NULL BTREE
4242
def mysql procs_priv 0 mysql PRIMARY 5 Routine_type A #CARD# NULL NULL BTREE
43-
def mysql proxy_priv 0 mysql PRIMARY 1 Host A #CARD# NULL NULL BTREE
44-
def mysql proxy_priv 0 mysql PRIMARY 2 User A #CARD# NULL NULL BTREE
45-
def mysql proxy_priv 0 mysql PRIMARY 3 Proxied_Host A #CARD# NULL NULL BTREE
46-
def mysql proxy_priv 0 mysql PRIMARY 4 Proxied_User A #CARD# NULL NULL BTREE
43+
def mysql proxies_priv 1 mysql Grantor 1 Grantor A #CARD# NULL NULL BTREE
44+
def mysql proxies_priv 0 mysql PRIMARY 1 Host A #CARD# NULL NULL BTREE
45+
def mysql proxies_priv 0 mysql PRIMARY 2 User A #CARD# NULL NULL BTREE
46+
def mysql proxies_priv 0 mysql PRIMARY 3 Proxied_host A #CARD# NULL NULL BTREE
47+
def mysql proxies_priv 0 mysql PRIMARY 4 Proxied_user A #CARD# NULL NULL BTREE
4748
def mysql servers 0 mysql PRIMARY 1 Server_name A #CARD# NULL NULL BTREE
4849
def mysql tables_priv 1 mysql Grantor 1 Grantor A #CARD# NULL NULL BTREE
4950
def mysql tables_priv 0 mysql PRIMARY 1 Host A #CARD# NULL NULL BTREE

‎mysql-test/suite/funcs_1/r/is_table_constraints.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def mysql PRIMARY mysql ndb_binlog_index
7373
def mysql PRIMARY mysql plugin
7474
def mysql PRIMARY mysql proc
7575
def mysql PRIMARY mysql procs_priv
76-
def mysql PRIMARY mysql proxy_priv
76+
def mysql PRIMARY mysql proxies_priv
7777
def mysql PRIMARY mysql servers
7878
def mysql PRIMARY mysql tables_priv
7979
def mysql PRIMARY mysql time_zone

‎mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def mysql PRIMARY mysql ndb_binlog_index PRIMARY KEY
2323
def mysql PRIMARY mysql plugin PRIMARY KEY
2424
def mysql PRIMARY mysql proc PRIMARY KEY
2525
def mysql PRIMARY mysql procs_priv PRIMARY KEY
26-
def mysql PRIMARY mysql proxy_priv PRIMARY KEY
26+
def mysql PRIMARY mysql proxies_priv PRIMARY KEY
2727
def mysql PRIMARY mysql servers PRIMARY KEY
2828
def mysql PRIMARY mysql tables_priv PRIMARY KEY
2929
def mysql PRIMARY mysql time_zone PRIMARY KEY

‎mysql-test/suite/funcs_1/r/is_tables_mysql.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ user_comment Procedure privileges
336336
Separator -----------------------------------------------------
337337
TABLE_CATALOG def
338338
TABLE_SCHEMA mysql
339-
TABLE_NAME proxy_priv
339+
TABLE_NAME proxies_priv
340340
TABLE_TYPE BASE TABLE
341341
ENGINE MyISAM
342342
VERSION 10

‎mysql-test/t/plugin_auth.test

+6-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ connect(plug_con,localhost,plug,plug_dest);
1616
--enable_query_log
1717

1818
GRANT PROXY ON plug_dest TO plug;
19+
--echo test proxies_priv columns
20+
--replace_column 7 xx
21+
SELECT * FROM mysql.proxies_priv;
22+
--echo test mysql.proxies_priv;
23+
SHOW CREATE TABLE mysql.proxies_priv;
1924

2025
connect(plug_con,localhost,plug,plug_dest);
2126

@@ -226,7 +231,7 @@ CREATE USER test_drop@localhost;
226231
GRANT PROXY ON future_user TO test_drop@localhost;
227232
SHOW GRANTS FOR test_drop@localhost;
228233
DROP USER test_drop@localhost;
229-
SELECT * FROM mysql.proxy_priv WHERE Host = 'test_drop' AND User = 'localhost';
234+
SELECT * FROM mysql.proxies_priv WHERE Host = 'test_drop' AND User = 'localhost';
230235

231236
DROP USER proxy_admin;
232237

‎mysql-test/t/system_mysql_db_fix40123.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ CREATE TABLE time_zone_leap_second ( Transition_time bigint signed NOT NULL,
7272
-- disable_query_log
7373

7474
# Drop all tables created by this test
75-
DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index, proxy_priv;
75+
DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index, proxies_priv;
7676

7777
-- enable_query_log
7878

‎mysql-test/t/system_mysql_db_fix50030.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ INSERT INTO servers VALUES ('test','localhost','test','root','', 0,'','mysql','r
7878
-- disable_query_log
7979

8080
# Drop all tables created by this test
81-
DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index, proxy_priv;
81+
DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index, proxies_priv;
8282

8383
-- enable_query_log
8484

‎mysql-test/t/system_mysql_db_fix50117.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ CREATE TABLE IF NOT EXISTS ndb_binlog_index (Position BIGINT UNSIGNED NOT NULL,
9797
-- disable_query_log
9898

9999
# Drop all tables created by this test
100-
DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index, proxy_priv;
100+
DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index, proxies_priv;
101101

102102
-- enable_query_log
103103

‎scripts/mysql_system_tables.sql

+3-3
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ PREPARE stmt FROM @str;
478478
EXECUTE stmt;
479479
DROP PREPARE stmt;
480480

481-
CREATE TABLE IF NOT EXISTS proxy_priv (Host char(60) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Proxied_Host char(16) binary DEFAULT '' NOT NULL, Proxied_User char(60) binary DEFAULT '' NOT NULL, With_Grant BOOL DEFAULT 0 NOT NULL, PRIMARY KEY Host (Host,User,Proxied_Host,Proxied_User) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='User proxy privileges';
481+
CREATE TABLE IF NOT EXISTS proxies_priv (Host char(60) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Proxied_host char(60) binary DEFAULT '' NOT NULL, Proxied_user char(16) binary DEFAULT '' NOT NULL, With_grant BOOL DEFAULT 0 NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp, PRIMARY KEY Host (Host,User,Proxied_host,Proxied_user), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='User proxy privileges';
482482

483-
-- Remember for later if proxy_priv table already existed
484-
set @had_proxy_priv_table= @@warning_count != 0;
483+
-- Remember for later if proxies_priv table already existed
484+
set @had_proxies_priv_table= @@warning_count != 0;

0 commit comments

Comments
 (0)