summaryrefslogtreecommitdiff
path: root/sql/table.h
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@oracle.com>2010-10-01 13:39:04 +0200
committerMattias Jonsson <mattias.jonsson@oracle.com>2010-10-01 13:39:04 +0200
commita01773dbee1318e0894057daed544188b14f90c8 (patch)
tree7fe8671cad7f06c8a5522b17b3dedf8bd449e3d2 /sql/table.h
parenta73b734949dde2725ed0bddaceef79c9be581ff8 (diff)
downloadmariadb-git-a01773dbee1318e0894057daed544188b14f90c8.tar.gz
Bug#51851: Server with SBR locks mutex twice on
LOAD DATA into partitioned MyISAM table Problem was that both partitioning and myisam used the same table_share->mutex for different protections (auto inc and repair). Solved by adding a specific mutex for the partitioning auto_increment. Also adding destroying the ha_data structure in free_table_share (which is to be propagated into 5.5). This is a 5.1 ONLY patch, already fixed in 5.5+.
Diffstat (limited to 'sql/table.h')
-rw-r--r--sql/table.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h
index bbb39aae6f7..132279169cb 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -463,6 +463,7 @@ typedef struct st_table_share
/** place to store storage engine specific data */
void *ha_data;
+ void (*ha_data_destroy)(void *); /* An optional destructor for ha_data. */
/*