diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-10-02 00:12:27 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-10-02 00:12:27 +0400 |
| commit | d72c594739467160fb30685483c41f0f747925db (patch) | |
| tree | 2118d6c50022f3510872d297e53f610abd13855f /sql/sql_load.cc | |
| parent | e33e27a6643e426a6143cf725a480ecd5a22899e (diff) | |
| parent | 00677a802beb48e1763eaf8874390bf335ccb43e (diff) | |
| download | mariadb-git-d72c594739467160fb30685483c41f0f747925db.tar.gz | |
Manual merge from mysql-5.1-bugteam into mysql-5.5-bugteam.
conflicts:
conflict dbug/dbug.c
conflict sql/sql_load.cc
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 15efa488173..ca6e0d818e2 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -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++)) |