diff options
| author | unknown <anozdrin@mysql.com> | 2005-11-10 22:48:00 +0300 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2005-11-10 22:48:00 +0300 |
| commit | 2ee2747bd2317cd6ae71fb4fa6541ceac1b75925 (patch) | |
| tree | 7d7b2f52ab7ab1a3a597f0158e9a1542bb0078a3 /sql/sp.cc | |
| parent | 3d42cd8debcb484b1cbebe94605f4a169c117b23 (diff) | |
| parent | 7dbea7df275237f8b3ed29cdc499f443a4f9f51f (diff) | |
| download | mariadb-git-2ee2747bd2317cd6ae71fb4fa6541ceac1b75925.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/alik/MySQL/devel/5.0-wl2818
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
mysql-test/r/rpl_sp.result:
Manual merge.
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index e01d05cf405..451cec75236 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -441,8 +441,8 @@ db_find_routine(THD *thd, int type, sp_name *name, sp_head **sphp) if (dbchanged && (ret= mysql_change_db(thd, olddb, 1))) goto done; *sphp= thd->lex->sphead; - (*sphp)->set_info((char *)definer, (uint)strlen(definer), - created, modified, &chistics, sql_mode); + (*sphp)->set_definer((char*) definer, (uint) strlen(definer)); + (*sphp)->set_info(created, modified, &chistics, sql_mode); (*sphp)->optimize(); } thd->lex->sql_command= oldcmd; |