mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 15:15:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

Browse source 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


client/mysql.cc:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Auto merged
mysql-test/r/information_schema.result:
  manual merge
mysql-test/t/information_schema.test:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
  manual merge
storage/ndb/src/ndbapi/DictCache.cpp:
  manual merge
This commit is contained in:
unknown 2006-05-16 10:37:40 +02:00
commit 37b79d90d3
25 changed files with 298 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/item_strfunc.cc
View file

@ -2579,7 +2579,7 @@ String *Item_load_file::val_str(String *str)
(void) fn_format(path, file_name->c_ptr(), mysql_real_data_home, "",
MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
if (!my_stat(path, &stat_info, MYF(MY_WME)))
if (!my_stat(path, &stat_info, MYF(0)))
goto err;
if (!(stat_info.st_mode & S_IROTH))