summaryrefslogtreecommitdiff
path: root/storage/maria/maria_pack.c
diff options
context:
space:
mode:
authorunknown <serg@janus.mylan>2008-01-09 18:51:05 +0100
committerunknown <serg@janus.mylan>2008-01-09 18:51:05 +0100
commit8116e16e556e6477ace80970be39302de72cbb6c (patch)
tree95a14cc67bf81eb462c0ebd184091c49e5358416 /storage/maria/maria_pack.c
parentb8416bce47af1a5559df24fad647c025b2724400 (diff)
downloadmariadb-git-8116e16e556e6477ace80970be39302de72cbb6c.tar.gz
ignore 'moved' state in maria_open() if requested
storage/maria/ma_pagecache.c: Change mode to -rw-rw-r-- storage/maria/ma_open.c: ignore 'moved' state if requested storage/maria/maria_pack.c: ignore 'moved' state in maria_open() storage/maria/unittest/ma_test_all-t: avoid a warning if $output is undefined
Diffstat (limited to 'storage/maria/maria_pack.c')
-rw-r--r--storage/maria/maria_pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/maria_pack.c b/storage/maria/maria_pack.c
index dc0afdd4b64..734687de9cf 100644
--- a/storage/maria/maria_pack.c
+++ b/storage/maria/maria_pack.c
@@ -406,7 +406,7 @@ static MARIA_HA *open_isam_file(char *name,int mode)
MARIA_SHARE *share;
DBUG_ENTER("open_isam_file");
- if (!(isam_file=maria_open(name,mode,
+ if (!(isam_file=maria_open(name, mode, HA_OPEN_IGNORE_MOVED_STATE |
(opt_wait ? HA_OPEN_WAIT_IF_LOCKED :
HA_OPEN_ABORT_IF_LOCKED))))
{