diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
| commit | 649390ac814ce5ea1e77b833ab5fe92dfcfe86d5 (patch) | |
| tree | ac8b15ac65b08a492c256369b73e372f6568c7a4 /sql/sql_load.cc | |
| parent | 06b8897e8e9a27b6ffc562af90153ab63f30e63e (diff) | |
| parent | 8df20918d6751dc1eeb47ab722269dbd9d2da297 (diff) | |
| download | mariadb-git-649390ac814ce5ea1e77b833ab5fe92dfcfe86d5.tar.gz | |
Merge of mysql-trunk-bugfixing into mysql-trunk-merge.
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 17c86602583..b2a816a69dd 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -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); |