mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

memory leak removing

Browse source
This commit is contained in:
bell@sanja.is.com.ua 2004-07-16 15:20:51 +03:00
parent 6952941de6
commit bbe121c0c9
3 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.bzrignore
View file

@ -799,3 +799,4 @@ vio/test-ssl
vio/test-sslclient vio/test-sslclient
vio/test-sslserver vio/test-sslserver
vio/viotest-ssl vio/viotest-ssl
libmysqld/sql_view.cc

12
sql/sql_lex.h
View file

@ -750,6 +750,18 @@ typedef struct st_lex
bool only_view_structure(); bool only_view_structure();
} LEX; } LEX;
struct st_lex_local: public st_lex
{
static void *operator new(size_t size)
{
return (void*) sql_alloc((uint) size);
}
static void *operator new(size_t size, MEM_ROOT *mem_root)
{
return (void*) alloc_root(mem_root, (uint) size);
}
static void operator delete(void *ptr,size_t size) {}
};
void lex_init(void); void lex_init(void);
void lex_free(void); void lex_free(void);

17
sql/sql_view.cc
View file

@ -19,6 +19,7 @@
#include "sql_acl.h" #include "sql_acl.h"
#include "sql_select.h" #include "sql_select.h"
#include "parse_file.h" #include "parse_file.h"
#include "sp.h"
static int mysql_register_view(THD *thd, TABLE_LIST *view, static int mysql_register_view(THD *thd, TABLE_LIST *view,
enum_view_create_mode mode); enum_view_create_mode mode);
@ -523,9 +524,15 @@ mysql_make_view(File_parser *parser, TABLE_LIST *table)
table->view_name.str= table->real_name; table->view_name.str= table->real_name;
table->view_name.length= table->real_name_length; table->view_name.length= table->real_name_length;
//TODO: md5 test here and warning if it is differ /*TODO: md5 test here and warning if it is differ */
table->view= lex= thd->lex= new st_lex; /*
TODO: TABLE mem root should be used here when VIEW will be stored in
TABLE cache
now Lex placed in statement memory
*/
table->view= lex= thd->lex= (LEX*) new(&thd->mem_root) st_lex_local;
lex_start(thd, (uchar*)table->query.str, table->query.length); lex_start(thd, (uchar*)table->query.str, table->query.length);
mysql_init_query(thd, true); mysql_init_query(thd, true);
lex->select_lex.select_number= ++thd->select_number; lex->select_lex.select_number= ++thd->select_number;
@ -563,6 +570,12 @@ mysql_make_view(File_parser *parser, TABLE_LIST *table)
} }
if (!res && !thd->is_fatal_error) if (!res && !thd->is_fatal_error)
{ {
/* move SP to main LEX */
sp_merge_funs(old_lex, lex);
if (lex->spfuns.array.buffer)
hash_free(&lex->spfuns);
old_next= table->next_global; old_next= table->next_global;
if ((table->next_global= lex->query_tables)) if ((table->next_global= lex->query_tables))
table->next_global->prev_global= &table->next_global; table->next_global->prev_global= &table->next_global;