summaryrefslogtreecommitdiff
path: root/mysys/default.c
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-04-06 17:22:21 +0300
committerunknown <monty@mysql.com>2005-04-06 17:22:21 +0300
commit080c8ab39bb110370b64837613e8453702b353c1 (patch)
treee94c78c8db8d7f6ca96a83d37f1af529688c9a72 /mysys/default.c
parentf3aa7770b647a9256b3c93f0ef4823b4cb73af55 (diff)
downloadmariadb-git-080c8ab39bb110370b64837613e8453702b353c1.tar.gz
Fixed errors descovered by valgrind 2.4
Added suppression file for some valgrind warnings that are not real errors mysql-test/mysql-test-run.sh: Added suppression of some valgrind warnings that are not real errors mysql-test/r/heap.result: Cleanup old tests and added new tests mysql-test/t/heap.test: Cleanup old tests and added new tests mysys/default.c: Removed duplicate fn_format() scripts/make_binary_distribution.sh: Added valgrind suppress file sql/ha_federated.cc: Ensure that 'socket' is initialized properly sql/ha_heap.cc: Ensure that with_auto_increment is initialized properly sql/mysqld.cc: Ensure that create_time is initialized for cached threads sql/sql_parse.cc: Indentation fix strings/decimal.c: Fixed wrong tests
Diffstat (limited to 'mysys/default.c')
-rw-r--r--mysys/default.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/default.c b/mysys/default.c
index ddff4e26be5..6352cc18d56 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -477,13 +477,13 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
if ((stat_info.st_mode & S_IWOTH) &&
(stat_info.st_mode & S_IFMT) == S_IFREG)
{
- fprintf(stderr, "warning: World-writable config file %s is ignored\n",
+ fprintf(stderr, "Warning: World-writable config file '%s' is ignored\n",
name);
return 0;
}
}
#endif
- if (!(fp= my_fopen(fn_format(name, name, "", "", 4), O_RDONLY, MYF(0))))
+ if (!(fp= my_fopen(name, O_RDONLY, MYF(0))))
return 0; /* Ignore wrong files */
while (fgets(buff, sizeof(buff) - 1, fp))