diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-05 01:04:08 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-05 01:04:08 +0200 |
| commit | d18a6cc33a220e056dfa1633b928ac0b1415789d (patch) | |
| tree | 1750cfa3cfd660f20d5055a78caff42a53363247 /mysys/mf_iocache.c | |
| parent | cec36f0f14b6c885aabe4eb989fb9ff4a4ae6a7c (diff) | |
| download | mariadb-git-d18a6cc33a220e056dfa1633b928ac0b1415789d.tar.gz | |
Fixes up things after merge from 3.23.44
Portability fixes.
Don't delete temporary tables on FLUSH tables.
client/client_priv.h:
Fix after merge
client/mysqldump.c:
Fix after merge
include/my_global.h:
Change CMP -> CMP_NUM because CMP was used in other places
include/violite.h:
Added missing prototype
myisam/ft_boolean_search.c:
Removed warnings
myisam/ft_nlq_search.c:
Removed warnings
myisam/mi_search.c:
CMP -> CMP_NUM
mysql-test/mysql-test-run.sh:
Write all logs to log directory
mysql-test/r/func_time.result:
Fix test results after merge
mysql-test/r/having.result:
Fix test results after merge
mysql-test/r/join.result:
Fix test results after merge
mysql-test/r/rpl000012.result:
Fix test results after merge
mysys/mf_iocache.c:
Allow multiple call to end_iocache.
sql/ha_innobase.cc:
Removed possible problem with using uninitialized variable
sql/log_event.cc:
Don't delete temporary tables on FLUSH tables.
(Needs to be fixed properly)
Diffstat (limited to 'mysys/mf_iocache.c')
| -rw-r--r-- | mysys/mf_iocache.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index f0100b5122b..da040a11514 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -776,6 +776,7 @@ int end_io_cache(IO_CACHE *info) (*pre_close)(info); if (info->alloced_buffer) { + info->alloced_buffer=0; if (info->file != -1) /* File doesn't exist */ error=flush_io_cache(info); my_free((gptr) info->buffer,MYF(MY_WME)); |