diff options
author | monty@mysql.com <> | 2004-04-28 20:19:50 +0300 |
---|---|---|
committer | monty@mysql.com <> | 2004-04-28 20:19:50 +0300 |
commit | 32d0b695031f281aa4079838785c4c770d7cf30a (patch) | |
tree | e291189eeafdc3ec3d13555fa8bd4a082a08166f /mysys/default.c | |
parent | 9d8bb4bd4c2ca623336d14566096f08490e1b042 (diff) | |
download | mariadb-git-32d0b695031f281aa4079838785c4c770d7cf30a.tar.gz |
Allow one to send empty strings with mysql_stmt_send_long_data()
mysql_stmt_reset() now resets param->long_data_used
Abort if --defaults-file=path-name uses a non-existing file (Bug #3413)
Fixed problem with symlink test (bug in 4.1.2)
Diffstat (limited to 'mysys/default.c')
-rw-r--r-- | mysys/default.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysys/default.c b/mysys/default.c index d09b0dd97af..af67520322f 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -166,6 +166,12 @@ int load_defaults(const char *conf_file, const char **groups, if ((error= search_default_file(&args, &alloc, "", forced_default_file, "", &group)) < 0) goto err; + if (error > 0) + { + fprintf(stderr, "Could not open required defaults file: %s\n", + forced_default_file); + goto err; + } } else if (dirname_length(conf_file)) { |