summaryrefslogtreecommitdiff
path: root/sql/sp_head.h
diff options
context:
space:
mode:
authormonty@mysql.com <>2006-01-06 01:08:48 +0200
committermonty@mysql.com <>2006-01-06 01:08:48 +0200
commitb0a5ea01ef4a9ba0f41c2c263b3cc53a0611fc1a (patch)
tree14416e5a83f9880e39f89a0bf5f03a8613ef7ce0 /sql/sp_head.h
parentb197c9abea9fdce0a595449f393520eb8354e784 (diff)
parent6e22e29de669b95aefc4f5f7ce46420e52c99870 (diff)
downloadmariadb-git-b0a5ea01ef4a9ba0f41c2c263b3cc53a0611fc1a.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql/sp_head.h')
-rw-r--r--sql/sp_head.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h
index ad747b3466f..2eebd35f6dc 100644
--- a/sql/sp_head.h
+++ b/sql/sp_head.h
@@ -285,7 +285,7 @@ public:
void set_info(longlong created, longlong modified,
st_sp_chistics *chistics, ulong sql_mode);
- void set_definer(char *definer, uint definerlen);
+ void set_definer(const char *definer, uint definerlen);
void reset_thd_mem_root(THD *thd);
@@ -294,7 +294,7 @@ public:
void optimize();
void opt_mark(uint ip);
- void recursion_level_error();
+ void recursion_level_error(THD *thd);
inline sp_instr *
get_instr(uint i)