diff options
| author | unknown <monty@mysql.com> | 2004-11-12 21:24:16 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-12 21:24:16 +0200 |
| commit | 7c6738fb3c6b5675d53e3c398b301213ebc892a7 (patch) | |
| tree | a243e10cedf415490ba7812f30575871555ce73d /mysys | |
| parent | f0dd2d240b6fa86932efee55b2fd190c5b0dcf11 (diff) | |
| download | mariadb-git-7c6738fb3c6b5675d53e3c398b301213ebc892a7.tar.gz | |
Portability fix for gcc 2.95.3
After merge fixes
mysql-test/r/mix_innodb_myisam_binlog.result:
After merge fixes
mysys/default.c:
After merge fixes
sql/mysql_priv.h:
Portability fix for gcc 2.95.3
sql/sql_base.cc:
Portability fix for gcc 2.95.3
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/default.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/default.c b/mysys/default.c index 02d4ec250f9..d6d84f65d8b 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -85,7 +85,8 @@ struct handle_option_ctx static int search_default_file(Process_option_func func, void *func_ctx, const char *dir, const char *config_file); -static int search_default_file_with_ext(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, +static int search_default_file_with_ext(Process_option_func func, + void *func_ctx, const char *dir, const char *ext, const char *config_file); |