summaryrefslogtreecommitdiff
path: root/storage/myisam/mi_locking.c
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-07-30 15:09:25 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-07-30 15:09:25 +0300
commit91181b225c574f65720b9ecf218a4122209a7248 (patch)
tree5a9c835e8823f29ee26f8b56a3458607448188a1 /storage/myisam/mi_locking.c
parentd17e9a02c4a08da9ac1b8f4c653f29f067d75a22 (diff)
parentfceda2dab6f8ea6c042f910cbc1d07d5df0cbc3c (diff)
downloadmariadb-git-91181b225c574f65720b9ecf218a4122209a7248.tar.gz
Merge 5.5 into 10.0
Diffstat (limited to 'storage/myisam/mi_locking.c')
-rw-r--r--storage/myisam/mi_locking.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/myisam/mi_locking.c b/storage/myisam/mi_locking.c
index 4fd287c6038..85b06c81312 100644
--- a/storage/myisam/mi_locking.c
+++ b/storage/myisam/mi_locking.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2009, 2018, MariaDB Corporation
This program is free software; you can redistribute it and/or modify
@@ -236,6 +236,10 @@ int mi_lock_database(MI_INFO *info, int lock_type)
info->invalidator=info->s->invalidator;
share->w_locks++;
share->tot_locks++;
+
+ DBUG_EXECUTE_IF("simulate_incorrect_share_wlock_value",
+ DEBUG_SYNC_C("after_share_wlock_increment"););
+
info->s->in_use= list_add(info->s->in_use, &info->in_use);
break;
default: