diff options
author | Guilhem Bichot <guilhem@mysql.com> | 2009-04-01 11:34:52 +0200 |
---|---|---|
committer | Guilhem Bichot <guilhem@mysql.com> | 2009-04-01 11:34:52 +0200 |
commit | c71aae73f6f864c97cf17b3e872346666b871c3f (patch) | |
tree | 4895816aee1a0fcef08daa0f68bf1b1fe9aa2b5a /storage/myisam/mi_locking.c | |
parent | 3c59ba32ab9cca29e01bd8dd2130af83ead8bde0 (diff) | |
parent | 7ca1ebd83a1a7d291593be7a94f5a37298dfc863 (diff) | |
download | mariadb-git-c71aae73f6f864c97cf17b3e872346666b871c3f.tar.gz |
merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except
those of davi.arnaut@sun.com-20090219210935-9vilvcisyyieffxl (TODO).
Diffstat (limited to 'storage/myisam/mi_locking.c')
-rw-r--r-- | storage/myisam/mi_locking.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/myisam/mi_locking.c b/storage/myisam/mi_locking.c index 2edeefad45f..f3d9934ed8c 100644 --- a/storage/myisam/mi_locking.c +++ b/storage/myisam/mi_locking.c @@ -299,6 +299,8 @@ void mi_get_status(void* param, my_bool concurrent_insert) info->save_state=info->s->state.state; info->state= &info->save_state; info->append_insert_at_end= concurrent_insert; + if (concurrent_insert) + info->s->state.state.uncacheable= TRUE; DBUG_VOID_RETURN; } |