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

mysql-5.1 -> mysql-5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2010-11-05 10:59:51 +01:00
parent 4cce72a929 4cfa91f42c
commit bc2e383e4a
94 changed files with 2028 additions and 1160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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,10 @@ 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)
my_free(buffer);
error=1;
}
List_iterator<XML_TAG> xmlit(taglist);
XML_TAG *t;
while ((t= xmlit++))