database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Renamed the "schema" column to "db" in mysql.proc to keep it in style with

Browse Source 
all the other mysql.* tables.
This commit is contained in:
pem@mysql.comhem.se
2003-12-16 19:14:10 +01:00
parent bb51272bd1
commit 7a1fddaa1f
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Docs/sp-imp-spec.txt
View File

@ -1056,7 +1056,7 @@
- The mysql.proc schema: - The mysql.proc schema:
CREATE TABLE proc ( CREATE TABLE proc (
schema char(64) binary DEFAULT '' NOT NULL, db char(64) binary DEFAULT '' NOT NULL,
name char(64) binary DEFAULT '' NOT NULL, name char(64) binary DEFAULT '' NOT NULL,
type enum('FUNCTION','PROCEDURE') NOT NULL, type enum('FUNCTION','PROCEDURE') NOT NULL,
specific_name char(64) binary DEFAULT '' NOT NULL, specific_name char(64) binary DEFAULT '' NOT NULL,
@ -1093,7 +1093,7 @@
'NO_AUTO_VALUE_ON_ZERO' 'NO_AUTO_VALUE_ON_ZERO'
) DEFAULT 0 NOT NULL, ) DEFAULT 0 NOT NULL,
comment char(64) binary DEFAULT '' NOT NULL, comment char(64) binary DEFAULT '' NOT NULL,
PRIMARY KEY (schema,name,type) PRIMARY KEY (db,name,type)
) comment='Stored Procedures'; ) comment='Stored Procedures';
-- --

4
scripts/mysql_create_system_tables.sh
View File

@ -289,7 +289,7 @@ fi
if test ! -f $mdata/proc.frm if test ! -f $mdata/proc.frm
then then
c_p="$c_p CREATE TABLE proc (" c_p="$c_p CREATE TABLE proc ("
c_p="$c_p schema char(64) binary DEFAULT '' NOT NULL," c_p="$c_p db char(64) binary DEFAULT '' NOT NULL,"
c_p="$c_p name char(64) binary DEFAULT '' NOT NULL," c_p="$c_p name char(64) binary DEFAULT '' NOT NULL,"
c_p="$c_p type enum('FUNCTION','PROCEDURE') NOT NULL," c_p="$c_p type enum('FUNCTION','PROCEDURE') NOT NULL,"
c_p="$c_p specific_name char(64) binary DEFAULT '' NOT NULL," c_p="$c_p specific_name char(64) binary DEFAULT '' NOT NULL,"
@ -326,7 +326,7 @@ then
c_p="$c_p 'NO_AUTO_VALUE_ON_ZERO'" c_p="$c_p 'NO_AUTO_VALUE_ON_ZERO'"
c_p="$c_p ) DEFAULT 0 NOT NULL," c_p="$c_p ) DEFAULT 0 NOT NULL,"
c_p="$c_p comment char(64) binary DEFAULT '' NOT NULL," c_p="$c_p comment char(64) binary DEFAULT '' NOT NULL,"
c_p="$c_p PRIMARY KEY (schema,name,type)" c_p="$c_p PRIMARY KEY (db,name,type)"
c_p="$c_p ) comment='Stored Procedures';" c_p="$c_p ) comment='Stored Procedures';"
fi fi

4
scripts/mysql_fix_privilege_tables.sql
View File

@ -140,7 +140,7 @@ unique index (name)
# #
CREATE TABLE IF NOT EXISTS proc ( CREATE TABLE IF NOT EXISTS proc (
schema char(64) binary DEFAULT '' NOT NULL, db char(64) binary DEFAULT '' NOT NULL,
name char(64) binary DEFAULT '' NOT NULL, name char(64) binary DEFAULT '' NOT NULL,
type enum('FUNCTION','PROCEDURE') NOT NULL, type enum('FUNCTION','PROCEDURE') NOT NULL,
specific_name char(64) binary DEFAULT '' NOT NULL, specific_name char(64) binary DEFAULT '' NOT NULL,
@ -177,5 +177,5 @@ CREATE TABLE IF NOT EXISTS proc (
'NO_AUTO_VALUE_ON_ZERO' 'NO_AUTO_VALUE_ON_ZERO'
) DEFAULT 0 NOT NULL, ) DEFAULT 0 NOT NULL,
comment char(64) binary DEFAULT '' NOT NULL, comment char(64) binary DEFAULT '' NOT NULL,
PRIMARY KEY (schema,name,type) PRIMARY KEY (db,name,type)
) comment='Stored Procedures'; ) comment='Stored Procedures';

6
sql/sp.cc
View File

@ -37,7 +37,7 @@ create_string(THD *thd, ulong *lenp,
enum enum
{ {
MYSQL_PROC_FIELD_SCHEMA = 0, MYSQL_PROC_FIELD_DB = 0,
MYSQL_PROC_FIELD_NAME, MYSQL_PROC_FIELD_NAME,
MYSQL_PROC_FIELD_TYPE, MYSQL_PROC_FIELD_TYPE,
MYSQL_PROC_FIELD_SPECIFIC_NAME, MYSQL_PROC_FIELD_SPECIFIC_NAME,
@ -64,12 +64,12 @@ db_find_routine_aux(THD *thd, int type, char *name, uint namelen,
DBUG_ENTER("db_find_routine_aux"); DBUG_ENTER("db_find_routine_aux");
DBUG_PRINT("enter", ("type: %d name: %*s", type, namelen, name)); DBUG_PRINT("enter", ("type: %d name: %*s", type, namelen, name));
TABLE *table; TABLE *table;
byte key[64+64+1]; // schema, name, type byte key[64+64+1]; // db, name, type
uint keylen; uint keylen;
int ret; int ret;
// Put the key together // Put the key together
memset(key, (int)' ', 64); // QQ Empty schema for now memset(key, (int)' ', 64); // QQ Empty db for now
keylen= namelen; keylen= namelen;
if (keylen > 64) if (keylen > 64)
keylen= 64; keylen= 64;