diff options
| author | unknown <monty@mysql.com> | 2004-04-28 20:19:50 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-04-28 20:19:50 +0300 |
| commit | ae629fff866dda4e0e3411b0614d0c1efdfb6362 (patch) | |
| tree | e291189eeafdc3ec3d13555fa8bd4a082a08166f /mysys | |
| parent | 5605374b668068ef5ede826b3d04e2fe7ead4f9f (diff) | |
| download | mariadb-git-ae629fff866dda4e0e3411b0614d0c1efdfb6362.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)
libmysql/libmysql.c:
Allow one to send empty strings with mysql_stmt_send_long_data()
mysql_stmt_reset() now resets param->long_data_used
mysys/default.c:
Abort if --defaults-file=path-name uses a non-existing file (Bug #3413)
sql/unireg.cc:
Fixed problem with symlink test: .frm table was not properly deleted if handler create failed
Diffstat (limited to 'mysys')
| -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)) { |