mirror of
https://github.com/MariaDB/server.git
synced 2025-02-16 02:15:33 +01:00
Clean up merge from 4.1, including making several enum fields
in the grant tables case-insensitive and updating test results. scripts/mysql_create_system_tables.sh: Fix collation of procs_priv.proc_priv scripts/mysql_fix_privilege_tables.sql: Fix enum fields to have case-insensitive collation mysql-test/r/information_schema.result: Update results mysql-test/r/system_mysql_db.result: Update results mysql-test/r/lowercase_table_grant.result: Update results
This commit is contained in:
parent
90cc9c6bb6
commit
e122a103e2
5 changed files with 18 additions and 18 deletions
|
@ -125,7 +125,7 @@ Field Type Collation Null Key Default Extra Privileges Comment
|
||||||
a int(11) NULL YES MUL NULL select,insert,update,references
|
a int(11) NULL YES MUL NULL select,insert,update,references
|
||||||
show full columns from mysql.db like "Insert%";
|
show full columns from mysql.db like "Insert%";
|
||||||
Field Type Collation Null Key Default Extra Privileges Comment
|
Field Type Collation Null Key Default Extra Privileges Comment
|
||||||
Insert_priv enum('N','Y') utf8_bin NO N select,insert,update,references
|
Insert_priv enum('N','Y') utf8_general_ci NO N select,insert,update,references
|
||||||
show full columns from v1;
|
show full columns from v1;
|
||||||
Field Type Collation Null Key Default Extra Privileges Comment
|
Field Type Collation Null Key Default Extra Privileges Comment
|
||||||
c varchar(64) utf8_general_ci NO select,insert,update,references
|
c varchar(64) utf8_general_ci NO select,insert,update,references
|
||||||
|
|
|
@ -6,8 +6,8 @@ Grants for mysqltest_1@localhost
|
||||||
GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
|
GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
|
||||||
GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_1'@'localhost'
|
GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_1'@'localhost'
|
||||||
select * from db where user = 'mysqltest_1';
|
select * from db where user = 'mysqltest_1';
|
||||||
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
|
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
|
||||||
localhost mysqltest mysqltest_1 Y Y Y Y Y Y N Y Y Y Y Y
|
localhost mysqltest mysqltest_1 Y Y Y Y Y Y N Y Y Y Y Y Y Y Y Y Y
|
||||||
update db set db = 'MYSQLtest' where db = 'mysqltest' and user = 'mysqltest_1' and host = 'localhost';
|
update db set db = 'MYSQLtest' where db = 'mysqltest' and user = 'mysqltest_1' and host = 'localhost';
|
||||||
flush privileges;
|
flush privileges;
|
||||||
show grants for mysqltest_1@localhost;
|
show grants for mysqltest_1@localhost;
|
||||||
|
@ -15,8 +15,8 @@ Grants for mysqltest_1@localhost
|
||||||
GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
|
GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
|
||||||
GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_1'@'localhost'
|
GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_1'@'localhost'
|
||||||
select * from db where user = 'mysqltest_1';
|
select * from db where user = 'mysqltest_1';
|
||||||
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
|
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
|
||||||
localhost MYSQLtest mysqltest_1 Y Y Y Y Y Y N Y Y Y Y Y
|
localhost MYSQLtest mysqltest_1 Y Y Y Y Y Y N Y Y Y Y Y Y Y Y Y Y
|
||||||
delete from db where db = 'MYSQLtest' and user = 'mysqltest_1' and host = 'localhost';
|
delete from db where db = 'MYSQLtest' and user = 'mysqltest_1' and host = 'localhost';
|
||||||
flush privileges;
|
flush privileges;
|
||||||
drop user mysqltest_1@localhost;
|
drop user mysqltest_1@localhost;
|
||||||
|
|
|
@ -150,7 +150,7 @@ procs_priv CREATE TABLE `procs_priv` (
|
||||||
`Routine_name` char(64) collate utf8_bin NOT NULL default '',
|
`Routine_name` char(64) collate utf8_bin NOT NULL default '',
|
||||||
`Grantor` char(77) collate utf8_bin NOT NULL default '',
|
`Grantor` char(77) collate utf8_bin NOT NULL default '',
|
||||||
`Timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
|
`Timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
|
||||||
`Proc_priv` set('Execute','Alter Routine','Grant') collate utf8_bin NOT NULL default '',
|
`Proc_priv` set('Execute','Alter Routine','Grant') character set utf8 NOT NULL default '',
|
||||||
PRIMARY KEY (`Host`,`Db`,`User`,`Routine_name`),
|
PRIMARY KEY (`Host`,`Db`,`User`,`Routine_name`),
|
||||||
KEY `Grantor` (`Grantor`)
|
KEY `Grantor` (`Grantor`)
|
||||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Procedure privileges'
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Procedure privileges'
|
||||||
|
|
|
@ -253,7 +253,7 @@ then
|
||||||
c_pp="$c_pp Routine_name char(64) binary DEFAULT '' NOT NULL,"
|
c_pp="$c_pp Routine_name char(64) binary DEFAULT '' NOT NULL,"
|
||||||
c_pp="$c_pp Grantor char(77) DEFAULT '' NOT NULL,"
|
c_pp="$c_pp Grantor char(77) DEFAULT '' NOT NULL,"
|
||||||
c_pp="$c_pp Timestamp timestamp(14),"
|
c_pp="$c_pp Timestamp timestamp(14),"
|
||||||
c_pp="$c_pp Proc_priv set('Execute','Alter Routine','Grant') DEFAULT '' NOT NULL,"
|
c_pp="$c_pp Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL,"
|
||||||
c_pp="$c_pp PRIMARY KEY (Host,Db,User,Routine_name),"
|
c_pp="$c_pp PRIMARY KEY (Host,Db,User,Routine_name),"
|
||||||
c_pp="$c_pp KEY Grantor (Grantor)"
|
c_pp="$c_pp KEY Grantor (Grantor)"
|
||||||
c_pp="$c_pp ) engine=MyISAM"
|
c_pp="$c_pp ) engine=MyISAM"
|
||||||
|
|
|
@ -243,16 +243,16 @@ SELECT @hadCreateViewPriv:=1 FROM user WHERE Create_view_priv LIKE '%';
|
||||||
#
|
#
|
||||||
# Create VIEWs privileges (v5.0)
|
# Create VIEWs privileges (v5.0)
|
||||||
#
|
#
|
||||||
ALTER TABLE db ADD Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Lock_tables_priv;
|
ALTER TABLE db ADD Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL AFTER Lock_tables_priv;
|
||||||
ALTER TABLE host ADD Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Lock_tables_priv;
|
ALTER TABLE host ADD Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL AFTER Lock_tables_priv;
|
||||||
ALTER TABLE user ADD Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Repl_client_priv;
|
ALTER TABLE user ADD Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL AFTER Repl_client_priv;
|
||||||
|
|
||||||
#
|
#
|
||||||
# Show VIEWs privileges (v5.0)
|
# Show VIEWs privileges (v5.0)
|
||||||
#
|
#
|
||||||
ALTER TABLE db ADD Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_view_priv;
|
ALTER TABLE db ADD Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL AFTER Create_view_priv;
|
||||||
ALTER TABLE host ADD Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_view_priv;
|
ALTER TABLE host ADD Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL AFTER Create_view_priv;
|
||||||
ALTER TABLE user ADD Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_view_priv;
|
ALTER TABLE user ADD Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL AFTER Create_view_priv;
|
||||||
|
|
||||||
#
|
#
|
||||||
# Assign create/show view privileges to people who have create provileges
|
# Assign create/show view privileges to people who have create provileges
|
||||||
|
@ -268,16 +268,16 @@ SELECT @hadCreateRoutinePriv:=1 FROM user WHERE Create_routine_priv LIKE '%';
|
||||||
#
|
#
|
||||||
# Create PROCEDUREs privileges (v5.0)
|
# Create PROCEDUREs privileges (v5.0)
|
||||||
#
|
#
|
||||||
ALTER TABLE db ADD Create_routine_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Show_view_priv;
|
ALTER TABLE db ADD Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL AFTER Show_view_priv;
|
||||||
ALTER TABLE user ADD Create_routine_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Show_view_priv;
|
ALTER TABLE user ADD Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL AFTER Show_view_priv;
|
||||||
|
|
||||||
#
|
#
|
||||||
# Alter PROCEDUREs privileges (v5.0)
|
# Alter PROCEDUREs privileges (v5.0)
|
||||||
#
|
#
|
||||||
ALTER TABLE db ADD Alter_routine_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_routine_priv;
|
ALTER TABLE db ADD Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL AFTER Create_routine_priv;
|
||||||
ALTER TABLE user ADD Alter_routine_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_routine_priv;
|
ALTER TABLE user ADD Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL AFTER Create_routine_priv;
|
||||||
|
|
||||||
ALTER TABLE db ADD Execute_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Alter_routine_priv;
|
ALTER TABLE db ADD Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL AFTER Alter_routine_priv;
|
||||||
|
|
||||||
#
|
#
|
||||||
# Assign create/alter routine privileges to people who have create privileges
|
# Assign create/alter routine privileges to people who have create privileges
|
||||||
|
|
Loading…
Add table
Reference in a new issue