diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-19 21:23:13 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-19 21:23:13 +0200 |
| commit | d7bedeb998c911c921d7b67dc07049955481d9b7 (patch) | |
| tree | 8bda97a92a625441a765c5282461fd89ee352624 /sql/log_event.cc | |
| parent | aa08887f7b724d8fc07d2d807d4b0b364ac937a7 (diff) | |
| download | mariadb-git-d7bedeb998c911c921d7b67dc07049955481d9b7.tar.gz | |
Added support for ULONG division with DIV
Fixed non fatal memory leak in slave code.
mysql-test/r/func_test.result:
Added test for DIV
mysql-test/t/func_test.test:
Added test for DIV
mysys/my_alloc.c:
More DBUG statements
sql/item_func.cc:
Added support for ULONG division with DIV
sql/log_event.cc:
Fixed memory leak (Wrong call to init_sql_alloc)
sql/slave.cc:
Fixed memory leak (Wrong call to init_sql_alloc)
sql/sql_base.cc:
More DBUG statements
sql/sql_class.cc:
Added init_for_queries() to fix memory leak in slave code
sql/sql_class.h:
Added init_for_queries() to fix memory leak in slave code
sql/sql_error.cc:
More DBUG statements
sql/sql_parse.cc:
Added init_for_queries() to fix memory leak in slave code
sql/unireg.h:
Moved memory defaults to include file
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 1f3a09ba93b..b57a691c267 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -875,7 +875,6 @@ void Query_log_event::print(FILE* file, bool short_form, char* last_db) int Query_log_event::exec_event(struct st_relay_log_info* rli) { int expected_error,actual_error = 0; - init_sql_alloc(&thd->mem_root, 8192,0); thd->db = rewrite_db((char*)db); /* @@ -1075,6 +1074,7 @@ int Start_log_event::write_data(IO_CACHE* file) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) int Start_log_event::exec_event(struct st_relay_log_info* rli) { + DBUG_ENTER("Start_log_event::exec_event"); /* All temporary tables was deleted on the master */ close_temporary_tables(thd); /* @@ -1082,7 +1082,7 @@ int Start_log_event::exec_event(struct st_relay_log_info* rli) */ if (!rli->mi->old_format) cleanup_load_tmpdir(); - return Log_event::exec_event(rli); + DBUG_RETURN(Log_event::exec_event(rli)); } #endif @@ -1535,7 +1535,6 @@ void Load_log_event::set_fields(List<Item> &field_list) int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli, bool use_rli_only_for_errors) { - init_sql_alloc(&thd->mem_root, 8192,0); thd->db = rewrite_db((char*)db); DBUG_ASSERT(thd->query == 0); thd->query = 0; // Should not be needed @@ -2164,9 +2163,6 @@ int User_var_log_event::exec_event(struct st_relay_log_info* rli) double real_val; longlong int_val; - if (type != ROW_RESULT) - init_sql_alloc(&thd->mem_root, 8192,0); - if (is_null) { it= new Item_null(); |