database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge recycle.(none):/src/bug23736/my50-bug23736

Browse Source 
into  recycle.(none):/src/bug23736/my51-bug23736
This commit is contained in:
iggy@recycle.(none)
2007-03-20 10:54:56 -04:00
parent 8ecbf6c03d 988ce58052
commit a56b04476a
4 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
client/mysqlbinlog.cc
View File

@ -158,11 +158,7 @@ class Load_log_processor
public:
Load_log_processor() {}
~Load_log_processor()
{
destroy();
delete_dynamic(&file_names);
}
~Load_log_processor() {}
int init()
{
@ -182,20 +178,22 @@ public:
target_dir_name_len= strlen(target_dir_name);
}
void destroy()
{
File_name_record *ptr= (File_name_record *)file_names.buffer;
File_name_record *end= ptr + file_names.elements;
for (; ptr < end; ptr++)
{
File_name_record *ptr= (File_name_record *)file_names.buffer;
File_name_record *end= ptr + file_names.elements;
for (; ptr<end; ptr++)
if (ptr->fname)
{
if (ptr->fname)
{
my_free(ptr->fname, MYF(MY_WME));
delete ptr->event;
bzero((char *)ptr, sizeof(File_name_record));
}
my_free(ptr->fname, MYF(MY_WME));
delete ptr->event;
bzero((char *)ptr, sizeof(File_name_record));
}
}
delete_dynamic(&file_names);
}
/*
Obtain Create_file event for LOAD DATA statement by its file_id.
@ -1577,6 +1575,7 @@ int main(int argc, char** argv)
cleanup();
free_defaults(defaults_argv);
my_free_open_file_info();
load_processor.destroy();
/* We cannot free DBUG, it is used in global destructors after exit(). */
my_end((info_flag ? MY_CHECK_ERROR : 0) | MY_DONT_FREE_DBUG);