Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
8c27ed9e
Commit
8c27ed9e
authored
17 years ago
by
malff/marcsql@weblab.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
parents
e8fec66e
e4370e7a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
262 additions
and
291 deletions
+262
-291
sql/sp.cc
sql/sp.cc
+156
-170
sql/sp.h
sql/sp.h
+6
-23
sql/sp_head.cc
sql/sp_head.cc
+75
-76
sql/sp_head.h
sql/sp_head.h
+2
-5
sql/sql_parse.cc
sql/sql_parse.cc
+23
-17
No files found.
sql/sp.cc
View file @
8c27ed9e
...
...
@@ -442,16 +442,36 @@ sp_returns_type(THD *thd, String &result, sp_head *sp)
delete
field
;
}
static
int
db_create_routine
(
THD
*
thd
,
int
type
,
sp_head
*
sp
)
/**
Write stored-routine object into mysql.proc.
This operation stores attributes of the stored procedure/function into
the mysql.proc.
@param thd Thread context.
@param type Stored routine type
(TYPE_ENUM_PROCEDURE or TYPE_ENUM_FUNCTION).
@param sp Stored routine object to store.
@return Error code. SP_OK is returned on success. Other SP_ constants are
used to indicate about errors.
*/
int
sp_create_routine
(
THD
*
thd
,
int
type
,
sp_head
*
sp
)
{
int
ret
;
TABLE
*
table
;
char
definer
[
USER_HOST_BUFF_SIZE
];
DBUG_ENTER
(
"db_create_routine"
);
DBUG_ENTER
(
"sp_create_routine"
);
DBUG_PRINT
(
"enter"
,
(
"type: %d name: %.*s"
,
type
,
sp
->
m_name
.
length
,
sp
->
m_name
.
str
));
DBUG_ASSERT
(
type
==
TYPE_ENUM_PROCEDURE
||
type
==
TYPE_ENUM_FUNCTION
);
/*
This statement will be replicated as a statement, even when using
row-based replication. The flag will be reset at the end of the
...
...
@@ -586,15 +606,33 @@ db_create_routine(THD *thd, int type, sp_head *sp)
}
static
int
db_drop_routine
(
THD
*
thd
,
int
type
,
sp_name
*
name
)
/**
Delete the record for the stored routine object from mysql.proc.
The operation deletes the record for the stored routine specified by name
from the mysql.proc table and invalidates the stored-routine cache.
@param thd Thread context.
@param type Stored routine type
(TYPE_ENUM_PROCEDURE or TYPE_ENUM_FUNCTION)
@param name Stored routine name.
@return Error code. SP_OK is returned on success. Other SP_ constants are
used to indicate about errors.
*/
int
sp_drop_routine
(
THD
*
thd
,
int
type
,
sp_name
*
name
)
{
TABLE
*
table
;
int
ret
;
DBUG_ENTER
(
"
db
_drop_routine"
);
DBUG_ENTER
(
"
sp
_drop_routine"
);
DBUG_PRINT
(
"enter"
,
(
"type: %d name: %.*s"
,
type
,
name
->
m_name
.
length
,
name
->
m_name
.
str
));
DBUG_ASSERT
(
type
==
TYPE_ENUM_PROCEDURE
||
type
==
TYPE_ENUM_FUNCTION
);
/*
This statement will be replicated as a statement, even when using
row-based replication. The flag will be reset at the end of the
...
...
@@ -618,6 +656,8 @@ db_drop_routine(THD *thd, int type, sp_name *name)
thd
->
binlog_query
(
THD
::
MYSQL_QUERY_TYPE
,
thd
->
query
,
thd
->
query_length
,
FALSE
,
FALSE
);
}
sp_cache_invalidate
();
}
close_thread_tables
(
thd
);
...
...
@@ -625,15 +665,35 @@ db_drop_routine(THD *thd, int type, sp_name *name)
}
static
int
db_update_routine
(
THD
*
thd
,
int
type
,
sp_name
*
name
,
st_sp_chistics
*
chistics
)
/**
Find and updated the record for the stored routine object in mysql.proc.
The operation finds the record for the stored routine specified by name
in the mysql.proc table and updates it with new attributes. After
successful update, the cache is invalidated.
@param thd Thread context.
@param type Stored routine type
(TYPE_ENUM_PROCEDURE or TYPE_ENUM_FUNCTION)
@param name Stored routine name.
@param chistics New values of stored routine attributes to write.
@return Error code. SP_OK is returned on success. Other SP_ constants are
used to indicate about errors.
*/
int
sp_update_routine
(
THD
*
thd
,
int
type
,
sp_name
*
name
,
st_sp_chistics
*
chistics
)
{
TABLE
*
table
;
int
ret
;
DBUG_ENTER
(
"
db
_update_routine"
);
DBUG_ENTER
(
"
sp
_update_routine"
);
DBUG_PRINT
(
"enter"
,
(
"type: %d name: %.*s"
,
type
,
name
->
m_name
.
length
,
name
->
m_name
.
str
));
DBUG_ASSERT
(
type
==
TYPE_ENUM_PROCEDURE
||
type
==
TYPE_ENUM_FUNCTION
);
/*
This statement will be replicated as a statement, even when using
row-based replication. The flag will be reset at the end of the
...
...
@@ -670,6 +730,8 @@ db_update_routine(THD *thd, int type, sp_name *name, st_sp_chistics *chistics)
thd
->
binlog_query
(
THD
::
MYSQL_QUERY_TYPE
,
thd
->
query
,
thd
->
query_length
,
FALSE
,
FALSE
);
}
sp_cache_invalidate
();
}
close_thread_tables
(
thd
);
...
...
@@ -755,13 +817,28 @@ print_field_values(THD *thd, TABLE *table,
}
static
int
db_show_routine_status
(
THD
*
thd
,
int
type
,
const
char
*
wild
)
/**
Implement SHOW STATUS statement for stored routines.
@param thd Thread context.
@param type Stored routine type
(TYPE_ENUM_PROCEDURE or TYPE_ENUM_FUNCTION)
@param name_pattern Stored routine name pattern.
@return Error code. SP_OK is returned on success. Other SP_ constants are
used to indicate about errors.
*/
int
sp_show_status_routine
(
THD
*
thd
,
int
type
,
const
char
*
name_pattern
)
{
TABLE
*
table
;
TABLE_LIST
tables
;
int
res
;
DBUG_ENTER
(
"db_show_routine_status"
);
DBUG_ENTER
(
"sp_show_status_routine"
);
DBUG_ASSERT
(
type
==
TYPE_ENUM_PROCEDURE
||
type
==
TYPE_ENUM_FUNCTION
);
memset
(
&
tables
,
0
,
sizeof
(
tables
));
tables
.
db
=
(
char
*
)
"mysql"
;
...
...
@@ -789,14 +866,14 @@ db_show_routine_status(THD *thd, int type, const char *wild)
{
switch
(
used_field
->
field_type
)
{
case
MYSQL_TYPE_TIMESTAMP
:
field_list
.
push_back
(
item
=
new
Item_return_date_time
(
used_field
->
field_name
,
MYSQL_TYPE_DATETIME
)
);
item
=
new
Item_return_date_time
(
used_field
->
field_name
,
MYSQL_TYPE_DATETIME
);
field_list
.
push_back
(
item
);
break
;
default:
field_list
.
push_back
(
item
=
new
Item_empty_string
(
used_field
->
field_name
,
used_field
->
field_length
)
);
item
=
new
Item_empty_string
(
used_field
->
field_name
,
used_field
->
field_length
);
field_list
.
push_back
(
item
);
break
;
}
}
...
...
@@ -840,13 +917,16 @@ db_show_routine_status(THD *thd, int type, const char *wild)
res
=
(
res
==
HA_ERR_END_OF_FILE
)
?
0
:
SP_INTERNAL_ERROR
;
goto
err_case1
;
}
if
((
res
=
print_field_values
(
thd
,
table
,
used_fields
,
type
,
wild
)))
goto
err_case1
;
while
(
!
table
->
file
->
index_next
(
table
->
record
[
0
]))
do
{
if
((
res
=
print_field_values
(
thd
,
table
,
used_fields
,
type
,
wild
)))
res
=
print_field_values
(
thd
,
table
,
used_fields
,
type
,
name_pattern
);
if
(
res
)
goto
err_case1
;
}
while
(
!
table
->
file
->
index_next
(
table
->
record
[
0
]));
res
=
SP_OK
;
}
...
...
@@ -913,9 +993,60 @@ sp_drop_db_routines(THD *thd, char *db)
}
/*****************************************************************************
PROCEDURE
******************************************************************************/
/**
Implement SHOW CREATE statement for stored routines.
The operation finds the stored routine object specified by name and then
calls sp_head::show_create_routine() for the object.
@param thd Thread context.
@param type Stored routine type
(TYPE_ENUM_PROCEDURE or TYPE_ENUM_FUNCTION)
@param name Stored routine name.
@return Error status.
@retval FALSE on success
@retval TRUE on error
*/
bool
sp_show_create_routine
(
THD
*
thd
,
int
type
,
sp_name
*
name
)
{
bool
err_status
=
TRUE
;
sp_head
*
sp
;
sp_cache
*
cache
=
type
==
TYPE_ENUM_PROCEDURE
?
thd
->
sp_proc_cache
:
thd
->
sp_func_cache
;
DBUG_ENTER
(
"sp_show_create_routine"
);
DBUG_PRINT
(
"enter"
,
(
"name: %.*s"
,
name
->
m_name
.
length
,
name
->
m_name
.
str
));
DBUG_ASSERT
(
type
==
TYPE_ENUM_PROCEDURE
||
type
==
TYPE_ENUM_FUNCTION
);
if
(
type
==
TYPE_ENUM_PROCEDURE
)
{
/*
SHOW CREATE PROCEDURE may require two instances of one sp_head
object when SHOW CREATE PROCEDURE is called for the procedure that
is being executed. Basically, there is no actual recursion, so we
increase the recursion limit for this statement (kind of hack).
SHOW CREATE FUNCTION does not require this because SHOW CREATE
statements are prohibitted within stored functions.
*/
thd
->
variables
.
max_sp_recursion_depth
++
;
}
if
((
sp
=
sp_find_routine
(
thd
,
type
,
name
,
&
cache
,
FALSE
)))
err_status
=
sp
->
show_create_routine
(
thd
,
type
);
if
(
type
==
TYPE_ENUM_PROCEDURE
)
thd
->
variables
.
max_sp_recursion_depth
--
;
DBUG_RETURN
(
err_status
);
}
/*
Obtain object representing stored procedure/function by its name from
...
...
@@ -1109,151 +1240,6 @@ sp_routine_exists_in_table(THD *thd, int type, sp_name *name)
}
int
sp_create_procedure
(
THD
*
thd
,
sp_head
*
sp
)
{
int
ret
;
DBUG_ENTER
(
"sp_create_procedure"
);
DBUG_PRINT
(
"enter"
,
(
"name: %.*s"
,
sp
->
m_name
.
length
,
sp
->
m_name
.
str
));
ret
=
db_create_routine
(
thd
,
TYPE_ENUM_PROCEDURE
,
sp
);
DBUG_RETURN
(
ret
);
}
int
sp_drop_procedure
(
THD
*
thd
,
sp_name
*
name
)
{
int
ret
;
DBUG_ENTER
(
"sp_drop_procedure"
);
DBUG_PRINT
(
"enter"
,
(
"name: %.*s"
,
name
->
m_name
.
length
,
name
->
m_name
.
str
));
ret
=
db_drop_routine
(
thd
,
TYPE_ENUM_PROCEDURE
,
name
);
if
(
!
ret
)
sp_cache_invalidate
();
DBUG_RETURN
(
ret
);
}
int
sp_update_procedure
(
THD
*
thd
,
sp_name
*
name
,
st_sp_chistics
*
chistics
)
{
int
ret
;
DBUG_ENTER
(
"sp_update_procedure"
);
DBUG_PRINT
(
"enter"
,
(
"name: %.*s"
,
name
->
m_name
.
length
,
name
->
m_name
.
str
));
ret
=
db_update_routine
(
thd
,
TYPE_ENUM_PROCEDURE
,
name
,
chistics
);
if
(
!
ret
)
sp_cache_invalidate
();
DBUG_RETURN
(
ret
);
}
int
sp_show_create_procedure
(
THD
*
thd
,
sp_name
*
name
)
{
int
ret
=
SP_KEY_NOT_FOUND
;
sp_head
*
sp
;
DBUG_ENTER
(
"sp_show_create_procedure"
);
DBUG_PRINT
(
"enter"
,
(
"name: %.*s"
,
name
->
m_name
.
length
,
name
->
m_name
.
str
));
/*
Increase the recursion limit for this statement. SHOW CREATE PROCEDURE
does not do actual recursion.
*/
thd
->
variables
.
max_sp_recursion_depth
++
;
if
((
sp
=
sp_find_routine
(
thd
,
TYPE_ENUM_PROCEDURE
,
name
,
&
thd
->
sp_proc_cache
,
FALSE
)))
ret
=
sp
->
show_create_procedure
(
thd
);
thd
->
variables
.
max_sp_recursion_depth
--
;
DBUG_RETURN
(
ret
);
}
int
sp_show_status_procedure
(
THD
*
thd
,
const
char
*
wild
)
{
int
ret
;
DBUG_ENTER
(
"sp_show_status_procedure"
);
ret
=
db_show_routine_status
(
thd
,
TYPE_ENUM_PROCEDURE
,
wild
);
DBUG_RETURN
(
ret
);
}
/*****************************************************************************
FUNCTION
******************************************************************************/
int
sp_create_function
(
THD
*
thd
,
sp_head
*
sp
)
{
int
ret
;
DBUG_ENTER
(
"sp_create_function"
);
DBUG_PRINT
(
"enter"
,
(
"name: %.*s"
,
sp
->
m_name
.
length
,
sp
->
m_name
.
str
));
ret
=
db_create_routine
(
thd
,
TYPE_ENUM_FUNCTION
,
sp
);
DBUG_RETURN
(
ret
);
}
int
sp_drop_function
(
THD
*
thd
,
sp_name
*
name
)
{
int
ret
;
DBUG_ENTER
(
"sp_drop_function"
);
DBUG_PRINT
(
"enter"
,
(
"name: %.*s"
,
name
->
m_name
.
length
,
name
->
m_name
.
str
));
ret
=
db_drop_routine
(
thd
,
TYPE_ENUM_FUNCTION
,
name
);
if
(
!
ret
)
sp_cache_invalidate
();
DBUG_RETURN
(
ret
);
}
int
sp_update_function
(
THD
*
thd
,
sp_name
*
name
,
st_sp_chistics
*
chistics
)
{
int
ret
;
DBUG_ENTER
(
"sp_update_procedure"
);
DBUG_PRINT
(
"enter"
,
(
"name: %.*s"
,
name
->
m_name
.
length
,
name
->
m_name
.
str
));
ret
=
db_update_routine
(
thd
,
TYPE_ENUM_FUNCTION
,
name
,
chistics
);
if
(
!
ret
)
sp_cache_invalidate
();
DBUG_RETURN
(
ret
);
}
int
sp_show_create_function
(
THD
*
thd
,
sp_name
*
name
)
{
sp_head
*
sp
;
DBUG_ENTER
(
"sp_show_create_function"
);
DBUG_PRINT
(
"enter"
,
(
"name: %.*s"
,
name
->
m_name
.
length
,
name
->
m_name
.
str
));
if
((
sp
=
sp_find_routine
(
thd
,
TYPE_ENUM_FUNCTION
,
name
,
&
thd
->
sp_func_cache
,
FALSE
)))
{
int
ret
=
sp
->
show_create_function
(
thd
);
DBUG_RETURN
(
ret
);
}
DBUG_RETURN
(
SP_KEY_NOT_FOUND
);
}
int
sp_show_status_function
(
THD
*
thd
,
const
char
*
wild
)
{
int
ret
;
DBUG_ENTER
(
"sp_show_status_function"
);
ret
=
db_show_routine_status
(
thd
,
TYPE_ENUM_FUNCTION
,
wild
);
DBUG_RETURN
(
ret
);
}
/*
Structure that represents element in the set of stored routines
used by statement or routine.
...
...
This diff is collapsed.
Click to expand it.
sql/sp.h
View file @
8c27ed9e
...
...
@@ -44,37 +44,20 @@ sp_exist_routines(THD *thd, TABLE_LIST *procs, bool any, bool no_error);
int
sp_routine_exists_in_table
(
THD
*
thd
,
int
type
,
sp_name
*
name
);
int
sp_create_procedure
(
THD
*
thd
,
sp_head
*
sp
);
int
sp_drop_procedure
(
THD
*
thd
,
sp_name
*
name
);
bool
sp_show_create_routine
(
THD
*
thd
,
int
type
,
sp_name
*
name
);
int
sp_
update_procedure
(
THD
*
thd
,
sp_name
*
name
,
st_sp_chistics
*
chistics
);
sp_
show_status_routine
(
THD
*
thd
,
int
type
,
const
char
*
wild
);
int
sp_
show_create_procedure
(
THD
*
thd
,
sp_name
*
name
);
sp_
create_routine
(
THD
*
thd
,
int
type
,
sp_head
*
sp
);
int
sp_
show_status_procedure
(
THD
*
thd
,
const
char
*
wild
);
sp_
update_routine
(
THD
*
thd
,
int
type
,
sp_name
*
name
,
st_sp_chistics
*
chistics
);
int
sp_create_function
(
THD
*
thd
,
sp_head
*
sp
);
int
sp_drop_function
(
THD
*
thd
,
sp_name
*
name
);
int
sp_update_function
(
THD
*
thd
,
sp_name
*
name
,
st_sp_chistics
*
chistics
);
int
sp_show_create_function
(
THD
*
thd
,
sp_name
*
name
);
int
sp_show_status_function
(
THD
*
thd
,
const
char
*
wild
);
sp_drop_routine
(
THD
*
thd
,
int
type
,
sp_name
*
name
);
/*
Procedures for pre-caching of stored routines and building table list
...
...
This diff is collapsed.
Click to expand it.
sql/sp_head.cc
View file @
8c27ed9e
...
...
@@ -637,17 +637,10 @@ int
sp_head
::
create
(
THD
*
thd
)
{
DBUG_ENTER
(
"sp_head::create"
);
int
ret
;
DBUG_PRINT
(
"info"
,
(
"type: %d name: %s params: %s body: %s"
,
m_type
,
m_name
.
str
,
m_params
.
str
,
m_body
.
str
));
if
(
m_type
==
TYPE_ENUM_FUNCTION
)
ret
=
sp_create_function
(
thd
,
this
);
else
ret
=
sp_create_procedure
(
thd
,
this
);
DBUG_RETURN
(
ret
);
DBUG_RETURN
(
sp_create_routine
(
thd
,
m_type
,
this
));
}
sp_head
::~
sp_head
()
...
...
@@ -2104,49 +2097,97 @@ bool check_show_routine_access(THD *thd, sp_head *sp, bool *full_access)
}
int
sp_head
::
show_create_procedure
(
THD
*
thd
)
/**
Implement SHOW CREATE statement for stored routines.
@param thd Thread context.
@param type Stored routine type
(TYPE_ENUM_PROCEDURE or TYPE_ENUM_FUNCTION)
@return Error status.
@retval FALSE on success
@retval TRUE on error
*/
bool
sp_head
::
show_create_routine
(
THD
*
thd
,
int
type
)
{
const
char
*
col1_caption
=
type
==
TYPE_ENUM_PROCEDURE
?
"Procedure"
:
"Function"
;
const
char
*
col3_caption
=
type
==
TYPE_ENUM_PROCEDURE
?
"Create Procedure"
:
"Create Function"
;
bool
err_status
;
Protocol
*
protocol
=
thd
->
protocol
;
char
buff
[
2048
];
String
buffer
(
buff
,
sizeof
(
buff
),
system_charset_info
);
int
res
;
List
<
Item
>
field_list
;
List
<
Item
>
fields
;
LEX_STRING
sql_mode
;
bool
full_access
;
DBUG_ENTER
(
"sp_head::show_create_procedure"
);
DBUG_PRINT
(
"info"
,
(
"procedure %s"
,
m_name
.
str
));
DBUG_ENTER
(
"sp_head::show_create_routine"
);
DBUG_PRINT
(
"info"
,
(
"routine %s"
,
m_name
.
str
));
DBUG_ASSERT
(
type
==
TYPE_ENUM_PROCEDURE
||
type
==
TYPE_ENUM_FUNCTION
);
if
(
check_show_routine_access
(
thd
,
this
,
&
full_access
))
DBUG_RETURN
(
1
);
DBUG_RETURN
(
TRUE
);
sys_var_thd_sql_mode
::
symbolic_mode_representation
(
thd
,
m_sql_mode
,
&
sql_mode
);
field_list
.
push_back
(
new
Item_empty_string
(
"Procedure"
,
NAME_CHAR_LEN
));
field_list
.
push_back
(
new
Item_empty_string
(
"sql_mode"
,
sql_mode
.
length
));
// 1024 is for not to confuse old clients
Item_empty_string
*
definition
=
new
Item_empty_string
(
"Create Procedure"
,
max
(
buffer
.
length
(),
1024
));
definition
->
maybe_null
=
TRUE
;
field_list
.
push_back
(
definition
);
sys_var_thd_sql_mode
::
symbolic_mode_representation
(
thd
,
m_sql_mode
,
&
sql_mode
);
/* Send header. */
fields
.
push_back
(
new
Item_empty_string
(
col1_caption
,
NAME_LEN
));
fields
.
push_back
(
new
Item_empty_string
(
"sql_mode"
,
sql_mode
.
length
));
{
/*
NOTE: SQL statement field must be not less than 1024 in order not to
confuse old clients.
*/
Item_empty_string
*
stmt_fld
=
new
Item_empty_string
(
col3_caption
,
max
(
m_defstr
.
length
,
1024
));
stmt_fld
->
maybe_null
=
TRUE
;
fields
.
push_back
(
stmt_fld
);
}
if
(
protocol
->
send_fields
(
&
fields
,
Protocol
::
SEND_NUM_ROWS
|
Protocol
::
SEND_EOF
))
{
DBUG_RETURN
(
TRUE
);
}
/* Send data. */
if
(
protocol
->
send_fields
(
&
field_list
,
Protocol
::
SEND_NUM_ROWS
|
Protocol
::
SEND_EOF
))
DBUG_RETURN
(
1
);
protocol
->
prepare_for_resend
();
protocol
->
store
(
m_name
.
str
,
m_name
.
length
,
system_charset_info
);
protocol
->
store
((
char
*
)
sql_mode
.
str
,
sql_mode
.
length
,
system_charset_info
);
protocol
->
store
(
sql_mode
.
str
,
sql_mode
.
length
,
system_charset_info
);
if
(
full_access
)
protocol
->
store
(
m_defstr
.
str
,
m_defstr
.
length
,
system_charset_info
);
protocol
->
store
(
m_defstr
.
str
,
m_defstr
.
length
,
&
my_charset_bin
);
else
protocol
->
store_null
();
res
=
protocol
->
write
();
send_eof
(
thd
);
DBUG_RETURN
(
res
);
err_status
=
protocol
->
write
();
if
(
!
err_status
)
send_eof
(
thd
);
DBUG_RETURN
(
err_status
);
}
/*
Add instruction to SP
...
...
@@ -2170,48 +2211,6 @@ void sp_head::add_instr(sp_instr *instr)
}
int
sp_head
::
show_create_function
(
THD
*
thd
)
{
Protocol
*
protocol
=
thd
->
protocol
;
char
buff
[
2048
];
String
buffer
(
buff
,
sizeof
(
buff
),
system_charset_info
);
int
res
;
List
<
Item
>
field_list
;
LEX_STRING
sql_mode
;
bool
full_access
;
DBUG_ENTER
(
"sp_head::show_create_function"
);
DBUG_PRINT
(
"info"
,
(
"procedure %s"
,
m_name
.
str
));
if
(
check_show_routine_access
(
thd
,
this
,
&
full_access
))
DBUG_RETURN
(
1
);
sys_var_thd_sql_mode
::
symbolic_mode_representation
(
thd
,
m_sql_mode
,
&
sql_mode
);
field_list
.
push_back
(
new
Item_empty_string
(
"Function"
,
NAME_CHAR_LEN
));
field_list
.
push_back
(
new
Item_empty_string
(
"sql_mode"
,
sql_mode
.
length
));
Item_empty_string
*
definition
=
new
Item_empty_string
(
"Create Function"
,
max
(
buffer
.
length
(),
1024
));
definition
->
maybe_null
=
TRUE
;
field_list
.
push_back
(
definition
);
if
(
protocol
->
send_fields
(
&
field_list
,
Protocol
::
SEND_NUM_ROWS
|
Protocol
::
SEND_EOF
))
DBUG_RETURN
(
1
);
protocol
->
prepare_for_resend
();
protocol
->
store
(
m_name
.
str
,
m_name
.
length
,
system_charset_info
);
protocol
->
store
(
sql_mode
.
str
,
sql_mode
.
length
,
system_charset_info
);
if
(
full_access
)
protocol
->
store
(
m_defstr
.
str
,
m_defstr
.
length
,
system_charset_info
);
else
protocol
->
store_null
();
res
=
protocol
->
write
();
send_eof
(
thd
);
DBUG_RETURN
(
res
);
}
/*
Do some minimal optimization of the code:
1) Mark used instructions
...
...
This diff is collapsed.
Click to expand it.
sql/sp_head.h
View file @
8c27ed9e
...
...
@@ -225,11 +225,8 @@ class sp_head :private Query_arena
bool
execute_procedure
(
THD
*
thd
,
List
<
Item
>
*
args
);
int
show_create_procedure
(
THD
*
thd
);
int
show_create_function
(
THD
*
thd
);
bool
show_create_routine
(
THD
*
thd
,
int
type
);
void
add_instr
(
sp_instr
*
instr
);
...
...
This diff is collapsed.
Click to expand it.
sql/sql_parse.cc
View file @
8c27ed9e
...
...
@@ -3928,11 +3928,15 @@ mysql_execute_command(THD *thd)
already puts on CREATE FUNCTION.
*/
/* Conditionally writes to binlog */
if
(
lex
->
sql_command
==
SQLCOM_ALTER_PROCEDURE
)
sp_result
=
sp_update_procedure
(
thd
,
lex
->
spname
,
&
lex
->
sp_chistics
);
else
sp_result
=
sp_update_function
(
thd
,
lex
->
spname
,
&
lex
->
sp_chistics
);
int
type
=
lex
->
sql_command
==
SQLCOM_ALTER_PROCEDURE
?
TYPE_ENUM_PROCEDURE
:
TYPE_ENUM_FUNCTION
;
sp_result
=
sp_update_routine
(
thd
,
type
,
lex
->
spname
,
&
lex
->
sp_chistics
);
}
}
switch
(
sp_result
)
...
...
@@ -3982,10 +3986,12 @@ mysql_execute_command(THD *thd)
}
#endif
/* Conditionally writes to binlog */
if
(
lex
->
sql_command
==
SQLCOM_DROP_PROCEDURE
)
sp_result
=
sp_drop_procedure
(
thd
,
lex
->
spname
);
else
sp_result
=
sp_drop_function
(
thd
,
lex
->
spname
);
int
type
=
lex
->
sql_command
==
SQLCOM_DROP_PROCEDURE
?
TYPE_ENUM_PROCEDURE
:
TYPE_ENUM_FUNCTION
;
sp_result
=
sp_drop_routine
(
thd
,
type
,
lex
->
spname
);
}
else
{
...
...
@@ -4042,8 +4048,8 @@ mysql_execute_command(THD *thd)
}
case
SQLCOM_SHOW_CREATE_PROC
:
{
if
(
sp_show_create_
procedure
(
thd
,
lex
->
spname
)
!=
SP_OK
)
{
/* We don't distinguish between errors for now */
if
(
sp_show_create_
routine
(
thd
,
TYPE_ENUM_PROCEDURE
,
lex
->
spname
)
)
{
my_error
(
ER_SP_DOES_NOT_EXIST
,
MYF
(
0
),
SP_COM_STRING
(
lex
),
lex
->
spname
->
m_name
.
str
);
goto
error
;
...
...
@@ -4052,8 +4058,8 @@ mysql_execute_command(THD *thd)
}
case
SQLCOM_SHOW_CREATE_FUNC
:
{
if
(
sp_show_create_
function
(
thd
,
lex
->
spname
)
!=
SP_OK
)
{
/* We don't distinguish between errors for now */
if
(
sp_show_create_
routine
(
thd
,
TYPE_ENUM_FUNCTION
,
lex
->
spname
)
)
{
my_error
(
ER_SP_DOES_NOT_EXIST
,
MYF
(
0
),
SP_COM_STRING
(
lex
),
lex
->
spname
->
m_name
.
str
);
goto
error
;
...
...
@@ -4063,14 +4069,14 @@ mysql_execute_command(THD *thd)
#ifdef NOT_USED
case
SQLCOM_SHOW_STATUS_PROC
:
{
res
=
sp_show_status_
procedure
(
thd
,
(
lex
->
wild
?
lex
->
wild
->
ptr
()
:
NullS
));
res
=
sp_show_status_
routine
(
thd
,
TYPE_ENUM_PROCEDURE
,
(
lex
->
wild
?
lex
->
wild
->
ptr
()
:
NullS
));
break
;
}
case
SQLCOM_SHOW_STATUS_FUNC
:
{
res
=
sp_show_status_
function
(
thd
,
(
lex
->
wild
?
lex
->
wild
->
ptr
()
:
NullS
));
res
=
sp_show_status_
routine
(
thd
,
TYPE_ENUM_FUNCTION
,
(
lex
->
wild
?
lex
->
wild
->
ptr
()
:
NullS
));
break
;
}
#endif
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment