mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
3702a1dbc4
Also made the parsing and handling of SP characteristics more general and extendable, and added a few ch:istics. Docs/sp-imp-spec.txt: Updated spec with new schema. Docs/sp-implemented.txt: Added info about ALTER and SHOW. mysql-test/r/sp.result: Minor change in SHOW FUNCTION|PROCEDURE STATUS output. scripts/mysql_create_system_tables.sh: New mysql.proc schema. scripts/mysql_fix_privilege_tables.sql: New mysql.proc schema. sql/lex.h: New lex words for SP characteristics. sql/sp.cc: New mysql.proc schema. Also made the characteristics handling slightly more extendable. sql/sp.h: Made the characteristics handling slightly more extendable. sql/sp_head.cc: Made the characteristics handling slightly more extendable. sql/sp_head.h: Made the characteristics handling slightly more extendable. sql/sql_lex.h: Made the characteristics handling slightly more extendable. sql/sql_parse.cc: Made the characteristics handling slightly more extendable. sql/sql_yacc.yy: Made the characteristics handling slightly more extendable and made the parsing of characteristics more general, and added a few new dito. (LANGUAGE SQL, and [NOT] DETERMINISTIC for starters).
179 lines
7.4 KiB
SQL
179 lines
7.4 KiB
SQL
-- This script converts any old privilege tables to privilege tables suitable
|
|
-- for MySQL 4.0.
|
|
|
|
-- You can safely ignore all 'Duplicate column' and 'Unknown column' errors"
|
|
-- as this just means that your tables where already up to date.
|
|
-- This script is safe to run even if your tables are already up to date!
|
|
|
|
-- On unix, you should use the mysql_fix_privilege_tables script to execute
|
|
-- this sql script.
|
|
-- On windows you should do 'mysql --force < mysql_fix_privilege_tables.sql'
|
|
|
|
USE mysql;
|
|
ALTER TABLE user type=MyISAM;
|
|
ALTER TABLE db type=MyISAM;
|
|
ALTER TABLE host type=MyISAM;
|
|
ALTER TABLE func type=MyISAM;
|
|
ALTER TABLE columns_priv type=MyISAM;
|
|
ALTER TABLE tables_priv type=MyISAM;
|
|
ALTER TABLE user change Password Password char(41) not null;
|
|
ALTER TABLE user add File_priv enum('N','Y') NOT NULL;
|
|
CREATE TABLE IF NOT EXISTS func (
|
|
name char(64) DEFAULT '' NOT NULL,
|
|
ret tinyint(1) DEFAULT '0' NOT NULL,
|
|
dl char(128) DEFAULT '' NOT NULL,
|
|
type enum ('function','aggregate') NOT NULL,
|
|
PRIMARY KEY (name)
|
|
);
|
|
|
|
-- Detect whether or not we had the Grant_priv column
|
|
SET @hadGrantPriv:=0;
|
|
SELECT @hadGrantPriv:=1 FROM user WHERE Grant_priv LIKE '%';
|
|
|
|
ALTER TABLE user add Grant_priv enum('N','Y') NOT NULL,add References_priv enum('N','Y') NOT NULL,add Index_priv enum('N','Y') NOT NULL,add Alter_priv enum('N','Y') NOT NULL;
|
|
ALTER TABLE host add Grant_priv enum('N','Y') NOT NULL,add References_priv enum('N','Y') NOT NULL,add Index_priv enum('N','Y') NOT NULL,add Alter_priv enum('N','Y') NOT NULL;
|
|
ALTER TABLE db add Grant_priv enum('N','Y') NOT NULL,add References_priv enum('N','Y') NOT NULL,add Index_priv enum('N','Y') NOT NULL,add Alter_priv enum('N','Y') NOT NULL;
|
|
|
|
--- Fix privileges for old tables
|
|
UPDATE user SET Grant_priv=File_priv,References_priv=Create_priv,Index_priv=Create_priv,Alter_priv=Create_priv WHERE @hadGrantPriv = 0;
|
|
UPDATE db SET References_priv=Create_priv,Index_priv=Create_priv,Alter_priv=Create_priv WHERE @hadGrantPriv = 0;
|
|
UPDATE host SET References_priv=Create_priv,Index_priv=Create_priv,Alter_priv=Create_priv WHERE @hadGrantPriv = 0;
|
|
|
|
ALTER TABLE user
|
|
ADD ssl_type enum('','ANY','X509', 'SPECIFIED') NOT NULL,
|
|
ADD ssl_cipher BLOB NOT NULL,
|
|
ADD x509_issuer BLOB NOT NULL,
|
|
ADD x509_subject BLOB NOT NULL;
|
|
ALTER TABLE user MODIFY ssl_type enum('','ANY','X509', 'SPECIFIED') NOT NULL;
|
|
|
|
CREATE TABLE IF NOT EXISTS tables_priv (
|
|
Host char(60) DEFAULT '' NOT NULL,
|
|
Db char(60) DEFAULT '' NOT NULL,
|
|
User char(16) DEFAULT '' NOT NULL,
|
|
Table_name char(60) DEFAULT '' NOT NULL,
|
|
Grantor char(77) DEFAULT '' NOT NULL,
|
|
Timestamp timestamp(14),
|
|
Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') DEFAULT '' NOT NULL,
|
|
Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL,
|
|
PRIMARY KEY (Host,Db,User,Table_name)
|
|
);
|
|
|
|
CREATE TABLE IF NOT EXISTS columns_priv (
|
|
Host char(60) DEFAULT '' NOT NULL,
|
|
Db char(60) DEFAULT '' NOT NULL,
|
|
User char(16) DEFAULT '' NOT NULL,
|
|
Table_name char(60) DEFAULT '' NOT NULL,
|
|
Column_name char(59) DEFAULT '' NOT NULL,
|
|
Timestamp timestamp(14),
|
|
Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL,
|
|
PRIMARY KEY (Host,Db,User,Table_name,Column_name)
|
|
);
|
|
|
|
ALTER TABLE columns_priv change Type Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL;
|
|
|
|
ALTER TABLE func add type enum ('function','aggregate') NOT NULL;
|
|
|
|
# Detect whether we had Show_db_priv
|
|
SET @hadShowDbPriv:=0;
|
|
SELECT @hadShowDbPriv:=1 FROM user WHERE Show_db_priv LIKE '%';
|
|
|
|
ALTER TABLE user
|
|
ADD Show_db_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER alter_priv,
|
|
ADD Super_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Show_db_priv,
|
|
ADD Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Super_priv,
|
|
ADD Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_tmp_table_priv,
|
|
ADD Execute_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Lock_tables_priv,
|
|
ADD Repl_slave_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Execute_priv,
|
|
ADD Repl_client_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Repl_slave_priv;
|
|
|
|
UPDATE user SET show_db_priv= select_priv, super_priv=process_priv, execute_priv=process_priv, create_tmp_table_priv='Y', Lock_tables_priv='Y', Repl_slave_priv=file_priv, Repl_client_priv=file_priv where user<>"" AND @hadShowDbPriv = 0;
|
|
|
|
ALTER TABLE user
|
|
ADD max_questions int(11) NOT NULL AFTER x509_subject,
|
|
ADD max_updates int(11) unsigned NOT NULL AFTER max_questions,
|
|
ADD max_connections int(11) unsigned NOT NULL AFTER max_updates;
|
|
|
|
ALTER TABLE db
|
|
ADD Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,
|
|
ADD Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL;
|
|
ALTER TABLE host
|
|
ADD Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,
|
|
ADD Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL;
|
|
|
|
#
|
|
# Create some possible missing tables
|
|
#
|
|
CREATE TABLE IF NOT EXISTS help_topic (
|
|
help_topic_id int unsigned not null,
|
|
name varchar(64) not null,
|
|
help_category_id smallint unsigned not null,
|
|
description text not null,
|
|
example text not null,
|
|
url varchar(128) not null,
|
|
primary key (help_topic_id), unique index (name)
|
|
) comment='help topics';
|
|
|
|
CREATE TABLE IF NOT EXISTS help_category (
|
|
help_category_id smallint unsigned not null,
|
|
name varchar(64) not null,
|
|
parent_category_id smallint unsigned null,
|
|
url varchar(128) not null,
|
|
primary key (help_category_id),
|
|
unique index (name)
|
|
) comment='help categories';
|
|
|
|
CREATE TABLE IF NOT EXISTS help_relation (
|
|
help_topic_id int unsigned not null references help_topic,
|
|
help_keyword_id int unsigned not null references help_keyword,
|
|
primary key (help_keyword_id, help_topic_id)
|
|
) comment='keyword-topic relation';
|
|
|
|
CREATE TABLE IF NOT EXISTS help_keyword (
|
|
help_keyword_id int unsigned not null,
|
|
name varchar(64) not null,
|
|
primary key (help_keyword_id),
|
|
unique index (name)
|
|
) comment='help keywords';
|
|
|
|
#
|
|
# Create proc table if it doesn't exists
|
|
#
|
|
|
|
CREATE TABLE IF NOT EXISTS proc (
|
|
schema char(64) binary DEFAULT '' NOT NULL,
|
|
name char(64) binary DEFAULT '' NOT NULL,
|
|
type enum('FUNCTION','PROCEDURE') NOT NULL,
|
|
specific_name char(64) binary DEFAULT '' NOT NULL,
|
|
language enum('SQL') DEFAULT 'SQL' NOT NULL,
|
|
sql_data_access enum('CONTAINS_SQL') DEFAULT 'CONTAINS_SQL' NOT NULL,
|
|
is_deterministic enum('YES','NO') DEFAULT 'NO' NOT NULL,
|
|
definition blob DEFAULT '' NOT NULL,
|
|
security_type enum('INVOKER','DEFINER') DEFAULT 'INVOKER' NOT NULL,
|
|
definer char(77) binary DEFAULT '' NOT NULL,
|
|
created timestamp,
|
|
modified timestamp,
|
|
sql_mode set(
|
|
'REAL_AS_FLOAT',
|
|
'PIPES_AS_CONCAT',
|
|
'ANSI_QUOTES',
|
|
'IGNORE_SPACE',
|
|
'NOT_USED',
|
|
'ONLY_FULL_GROUP_BY',
|
|
'NO_UNSIGNED_SUBTRACTION',
|
|
'NO_DIR_IN_CREATE',
|
|
'POSTGRESQL',
|
|
'ORACLE',
|
|
'MSSQL',
|
|
'DB2',
|
|
'MAXDB',
|
|
'NO_KEY_OPTIONS',
|
|
'NO_TABLE_OPTIONS',
|
|
'NO_FIELD_OPTIONS',
|
|
'MYSQL323',
|
|
'MYSQL40',
|
|
'ANSI',
|
|
'NO_AUTO_VALUE_ON_ZERO'
|
|
) DEFAULT 0 NOT NULL,
|
|
comment char(64) binary DEFAULT '' NOT NULL,
|
|
PRIMARY KEY (schema,name,type)
|
|
) comment='Stored Procedures';
|