diff options
| author | unknown <monty@mysql.com> | 2006-01-06 01:08:48 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-01-06 01:08:48 +0200 |
| commit | 29fde5280234821d4e8fa429991cddf60fa2093f (patch) | |
| tree | 14416e5a83f9880e39f89a0bf5f03a8613ef7ce0 /sql/sp_head.h | |
| parent | f133b06567c459ad299cf16c38b5d3655abe1266 (diff) | |
| parent | 64206b1850bc93c74f93c3e0dd2e2e909240fcda (diff) | |
| download | mariadb-git-29fde5280234821d4e8fa429991cddf60fa2093f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
mysql-test/r/create.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/t/disabled.def:
Manual merge
sql/mysqld.cc:
Manual merge
sql/sp_head.cc:
Manual merge
sql/sql_trigger.cc:
Manual merge
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 4 |
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) |