mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
This commit is contained in:
@ -2810,6 +2810,7 @@ mysql_execute_command(THD *thd)
|
||||
sp_head *sph= sp_find_function(thd, &lex->udf.name);
|
||||
if (sph)
|
||||
{
|
||||
sph->destroy(); // QQ Free memory. Remove this when caching!!!
|
||||
net_printf(thd, ER_UDF_EXISTS, lex->udf.name.str);
|
||||
goto error;
|
||||
}
|
||||
@ -3046,6 +3047,8 @@ mysql_execute_command(THD *thd)
|
||||
thd->net.no_send_ok= nsok;
|
||||
#endif
|
||||
|
||||
sp->destroy(); // QQ Free memory. Remove this when caching!!!
|
||||
|
||||
if (res == 0)
|
||||
send_ok(thd);
|
||||
else
|
||||
@ -3071,6 +3074,7 @@ mysql_execute_command(THD *thd)
|
||||
{
|
||||
/* QQ This is an no-op right now, since we haven't
|
||||
put the characteristics in yet. */
|
||||
sp->destroy(); // QQ Free memory. Remove this when caching!!!
|
||||
send_ok(thd);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user