gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #15229 - Notice - Undefined index: strPrivDescDelete versioning rowsTbl

Browse Source 
Fixes: #15229
Adds support for delete versioning rows privilege
See: https://mariadb.com/kb/en/library/grant/#table-privileges
The privilege is named 'Delete versioning rows' in SHOW GRANTS and 'Delete_history_priv' in mysql.user
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2019-04-27 00:22:58 +02:00
parent 977c439bc3
commit 91c758aae4
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/classes/Server/Privileges.php
View File

@ -429,6 +429,16 @@ class Privileges
'SHOW VIEW', 'SHOW VIEW',
__('Allows performing SHOW CREATE VIEW queries.') __('Allows performing SHOW CREATE VIEW queries.')
), ),
array(
'Delete_history_priv',
'DELETE HISTORY',
$GLOBALS['strPrivDescDeleteHistoricalRows']
),
array(
'Delete versioning rows_priv',
'DELETE HISTORY',
$GLOBALS['strPrivDescDeleteHistoricalRows']
),
array( array(
'Create_routine_priv', 'Create_routine_priv',
'CREATE ROUTINE', 'CREATE ROUTINE',
@ -1082,6 +1092,9 @@ class Privileges
} elseif ($current_grant == 'Show view_priv') { } elseif ($current_grant == 'Show view_priv') {
$tmp_current_grant = 'ShowView_priv'; $tmp_current_grant = 'ShowView_priv';
$current_grant = 'Show_view_priv'; $current_grant = 'Show_view_priv';
} elseif ($current_grant == 'Delete versioning rows_priv') {
$tmp_current_grant = 'DeleteHistoricalRows_priv';
$current_grant = 'Delete_history_priv';
} else { } else {
$tmp_current_grant = $current_grant; $tmp_current_grant = $current_grant;
} }

1
server_privileges.php
View File

@ -71,6 +71,7 @@ $strPrivDescCreateTmpTable = __('Allows creating temporary tables.');
$strPrivDescCreateUser = __('Allows creating, dropping and renaming user accounts.'); $strPrivDescCreateUser = __('Allows creating, dropping and renaming user accounts.');
$strPrivDescCreateView = __('Allows creating new views.'); $strPrivDescCreateView = __('Allows creating new views.');
$strPrivDescDelete = __('Allows deleting data.'); $strPrivDescDelete = __('Allows deleting data.');
$strPrivDescDeleteHistoricalRows = __('Allows deleting historical rows.');
$strPrivDescDropDb = __('Allows dropping databases and tables.'); $strPrivDescDropDb = __('Allows dropping databases and tables.');
$strPrivDescDropTbl = __('Allows dropping tables.'); $strPrivDescDropTbl = __('Allows dropping tables.');
$strPrivDescEvent = __('Allows to set up events for the event scheduler.'); $strPrivDescEvent = __('Allows to set up events for the event scheduler.');