database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge of mysql-trunk-bugfixing into mysql-trunk-merge.

Browse Source
This commit is contained in:
Davi Arnaut
2010-07-15 10:47:50 -03:00
parent 06b8897e8e 8df20918d6
commit 649390ac81
488 changed files with 12061 additions and 12284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_load.cc
View File

@@ -355,7 +355,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
(void) fn_format(name, ex->file_name, mysql_real_data_home, "",
MY_RELATIVE_PATH | MY_UNPACK_FILENAME |
MY_RETURN_REAL_PATH);
#if !defined(__WIN__) && ! defined(__NETWARE__)
#if !defined(__WIN__)
MY_STAT stat_info;
if (!mysql_file_stat(key_file_load, name, &stat_info, MYF(MY_WME)))
DBUG_RETURN(TRUE);
@@ -1337,7 +1337,7 @@ READ_INFO::READ_INFO(File file_par, uint tot_length, CHARSET_INFO *cs,
(is_fifo ? READ_FIFO : READ_CACHE),0L,1,
MYF(MY_WME)))
{
my_free((uchar*) buffer,MYF(0)); /* purecov: inspected */
my_free(buffer); /* purecov: inspected */
error=1;
}
else
@@ -1368,7 +1368,7 @@ READ_INFO::~READ_INFO()
{
if (need_end_io_cache)
::end_io_cache(&cache);
my_free((uchar*) buffer,MYF(0));
my_free(buffer);
error=1;
}
List_iterator<XML_TAG> xmlit(taglist);