diff options
| author | unknown <dlenev@mysql.com> | 2005-07-13 15:08:13 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-07-13 15:08:13 +0400 |
| commit | 9aa15040628a45cbb269a4187931e82023df1e89 (patch) | |
| tree | 27047290ecb242a0a2f69b3875b188156034bba9 /sql/sp.h | |
| parent | 9ea8a51178e5315957d862de2eed38df2afe9161 (diff) | |
| parent | 11f9e513d7080c9965e13211d88840960d5ffebb (diff) | |
| download | mariadb-git-9aa15040628a45cbb269a4187931e82023df1e89.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc
mysql-test/r/sp-error.result:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/share/errmsg.txt:
Manual merge.
sql/sp.cc:
Manual merge.
Diffstat (limited to 'sql/sp.h')
| -rw-r--r-- | sql/sp.h | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -74,9 +74,6 @@ sp_show_create_function(THD *thd, sp_name *name); int sp_show_status_function(THD *thd, const char *wild); -bool -sp_function_exists(THD *thd, sp_name *name); - /* Procedures for pre-caching of stored routines and building table list |