diff options
| author | unknown <anozdrin@mysql.com> | 2006-03-09 20:41:21 +0300 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2006-03-09 20:41:21 +0300 |
| commit | 99b9f7a45bab6edd147cbc34f65640142ca71dd6 (patch) | |
| tree | 2b6538fc49c0e44c25ff8300cdb977f7d4ff8119 /sql/sp_head.h | |
| parent | 4c8805619e5d12d86b1d6d5d38543191b74c0632 (diff) | |
| parent | bc6b7859ae61fa7977d8134c0e890e3f82a31848 (diff) | |
| download | mariadb-git-99b9f7a45bab6edd147cbc34f65640142ca71dd6.tar.gz | |
Merge mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-tree
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-merged
client/mysqldump.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/rpl_ddl.result:
Auto merged
mysql-test/r/rpl_sp.result:
Auto merged
mysql-test/r/rpl_trigger.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/sql_mode.result:
Auto merged
mysql-test/t/rpl_trigger.test:
Auto merged
mysql-test/t/skip_grants.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.cc:
Auto merged
mysql-test/lib/mtr_cases.pl:
Manually merged.
sql/sp.cc:
Manually merged.
sql/sql_yacc.yy:
Manually merged.
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index 472e5343991..66e0a5856f4 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -303,6 +303,7 @@ public: st_sp_chistics *chistics, ulong sql_mode); void set_definer(const char *definer, uint definerlen); + void set_definer(const LEX_STRING *user_name, const LEX_STRING *host_name); void reset_thd_mem_root(THD *thd); |