diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-11-18 18:54:27 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-11-18 18:54:27 +0200 |
| commit | 84281294eab2441a118d2c1414c6d6e531e89c5b (patch) | |
| tree | 21a08cbc0f6aecfbbbf13d5cac0d19bc67952322 /mysys/mf_keycache.c | |
| parent | cde9c4299b1f77abed719dbacb278030010760e6 (diff) | |
| parent | c072804d51c2941a955747afc0dae802e8843845 (diff) | |
| download | mariadb-git-84281294eab2441a118d2c1414c6d6e531e89c5b.tar.gz | |
Merge with 4.0 tree
BitKeeper/etc/logging_ok:
auto-union
scripts/Makefile.am:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
Auto merged
BUILD/compile-pentium-gcov:
merge
myisam/mi_test2.c:
use original code
mysql-test/t/range.test:
Fixed comment
mysys/mf_keycache.c:
Fixed comments
Diffstat (limited to 'mysys/mf_keycache.c')
| -rw-r--r-- | mysys/mf_keycache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 280b69b18bf..406b826382a 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -2038,7 +2038,7 @@ static int flush_cached_blocks(KEY_CACHE *keycache, /* flush all key blocks for a file to disk, but don't do any mutex locks - flush_key_blocks() + flush_key_blocks_int() keycache pointer to a key cache data structure file handler for the file to flush to flush_type type of the flush @@ -2255,7 +2255,7 @@ restart: RETURN 0 ok 1 error - */ +*/ int flush_key_blocks(KEY_CACHE_HANDLE key_cache, File file, enum flush_type type) |