summaryrefslogtreecommitdiff
path: root/myisam/myisamdef.h
diff options
context:
space:
mode:
authorunknown <Kristofer.Pettersson@naruto.>2006-09-19 17:40:09 +0200
committerunknown <Kristofer.Pettersson@naruto.>2006-09-19 17:40:09 +0200
commit18edc55b83a2b9fb4ac6e36c88f86825c207b55f (patch)
treebd18651be61661b07a4846ec2c0dba96be7b19c2 /myisam/myisamdef.h
parent2247a2ab81708fba82ae3839b48d5fc788f96f02 (diff)
downloadmariadb-git-18edc55b83a2b9fb4ac6e36c88f86825c207b55f.tar.gz
Bug#20789 Merge Subtable Rename Causes Crash
- When a MyISAM table which belongs to a merge table union and is renamed the associated file descriptors are closed on windows. This causes a server crash next time an insert or update is performed on the merge table. - This patch prevents the system from crashing on windows by checking for bad file descriptors every time the MyISAM table is locked by associated the merge table. myisam/mi_locking.c: - Added check for bad file descriptors when table is part of merge union. - This patch prevents the server from crash on windows. myisam/myisamdef.h: Added boolean value to indicate that this myisam table is part of a merge union. myisammrg/myrg_locking.c: Added paramter owned_by_merge=TRUE for mi_lock_database through MYRG_TABLE struct.
Diffstat (limited to 'myisam/myisamdef.h')
-rw-r--r--myisam/myisamdef.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h
index d589173f0e7..ea45915a088 100644
--- a/myisam/myisamdef.h
+++ b/myisam/myisamdef.h
@@ -278,6 +278,9 @@ struct st_myisam_info {
my_bool page_changed; /* If info->buff can't be used for rnext */
my_bool buff_used; /* If info->buff has to be reread for rnext */
my_bool once_flags; /* For MYISAMMRG */
+#ifdef __WIN__
+ my_bool owned_by_merge; /* This MyISAM table is part of a merge union */
+#endif
#ifdef THREAD
THR_LOCK_DATA lock;
#endif