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

Manual merge from mysql-5.1-bugteam into mysql-5.5-bugteam.

Browse Source 
conflicts:
   conflict      dbug/dbug.c
   conflict      sql/sql_load.cc
This commit is contained in:
Alexey Kopytov
2010-10-02 00:12:27 +04:00
parent 16076e6a6f e1e838169a
commit 49e715258f
8 changed files with 60 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_load.cc
View File

@ -1345,6 +1345,7 @@ READ_INFO::READ_INFO(File file_par, uint tot_length, CHARSET_INFO *cs,
MYF(MY_WME)))
{
my_free(buffer); /* purecov: inspected */
buffer= NULL;
error=1;
}
else
@ -1371,13 +1372,11 @@ READ_INFO::READ_INFO(File file_par, uint tot_length, CHARSET_INFO *cs,
READ_INFO::~READ_INFO()
{
if (!error)
{
if (need_end_io_cache)
::end_io_cache(&cache);
if (!error && need_end_io_cache)
::end_io_cache(&cache);
if (buffer != NULL)
my_free(buffer);
error=1;
}
List_iterator<XML_TAG> xmlit(taglist);
XML_TAG *t;
while ((t= xmlit++))