summaryrefslogtreecommitdiff
path: root/sql/ha_partition.h
diff options
context:
space:
mode:
authorunknown <patg@krsna.patg.net>2005-11-18 17:02:27 -0800
committerunknown <patg@krsna.patg.net>2005-11-18 17:02:27 -0800
commit136c91ddf6cb811d82a0645554968f1031e62f2d (patch)
tree90200fe1707a8b5faf278bd0bfd906951543a2b8 /sql/ha_partition.h
parent391ee87ae4c6eeb469fd3df432f6a1f677171f5a (diff)
downloadmariadb-git-136c91ddf6cb811d82a0645554968f1031e62f2d.tar.gz
BUG #14524
Patch that fixes crashing when partition uses blackole for underlying tables. mysql-test/r/partition.result: BUG #14524 New test result mysql-test/t/partition.test: BUG #14524 New test sql/ha_partition.cc: BUG# 14524 Added new class var m_no_locks to keep track of the absense of locks. If '0', then lock_count returns 0, which keeps thr_multi_lock from crashing in the case of the underlying table being ha_blackhole. sql/ha_partition.h: BUG #14524 Added new class var m_no_locks to keep track of lock count sql/lock.cc: BUG #14524 DBUG PRINTs and ENTERs to make tracking the bug easier. I think these are useful regardless of this bug. sql/sql_partition.cc: BUG #14524 Changed umlaut o to allow fixing bug 14524 using DDD (file would not display in DDD)
Diffstat (limited to 'sql/ha_partition.h')
-rw-r--r--sql/ha_partition.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h
index 841719bddf4..fb180fdf666 100644
--- a/sql/ha_partition.h
+++ b/sql/ha_partition.h
@@ -67,6 +67,7 @@ private:
u_long m_low_byte_first;
uint m_tot_parts; // Total number of partitions;
+ uint m_no_locks; // For engines like ha_blackhole, which needs no locks
uint m_last_part; // Last file that we update,write
int m_lock_type; // Remembers type of last
// external_lock