Konstantin Osipov ef15a335b3 Backport of: ... ---------------------------------------------------------- revno: 2630.4.38 committer: Konstantin Osipov <konstantin@mysql.com> branch nick: mysql-6.0-4144 timestamp: Wed 2008-06-25 22:07:06 +0400 message: WL#4144 - Lock MERGE engine children. Committing a version of the patch merged with WL#3726 on behalf of Ingo. Step #1: Move locking from parent to children. MERGE children are now left in the query list of tables after inserted there in open_tables(). So they are locked by lock_tables() as all other tables are. The MERGE parent does not store locks any more. It appears in a MYSQL_LOCK with zero lock data. This is kind of a "dummy" lock. All other lock handling is also done directly on the children. To protect against parent or child modifications during LOCK TABLES, the children are detached after every statement and attached before every statement, even under LOCK TABLES. The children table list is removed from the query list of tables on every detach and on close of the parent. Step #2: Move MERGE specific functionality from SQL layer into table handler. Functionality moved from SQL layer (mainly sql_base.cc) to the table handler (ha_myisammrg.cc). Unnecessary code is removed from the SQL layer. Step #3: Moved all MERGE specific members from TABLE to ha_myisammrg. Moved members from TABLE to ha_myisammrg. Renamed some mebers. Fixed comments. Step #4: Valgrind and coverage testing Valgrind did not uncover new problems. Added purecov comments. Added a new test for DATA/INDEX DIRECTORY options. Changed handling of ::reset() for non-attached children. Fixed the merge-big test. Step #5: Fixed crashes detected during review Changed detection when to attach/detach. Added new tests. Backport also the fix for Bug#44040 "MySQL allows creating a MERGE table upon VIEWs but crashes when using it"		2009-12-03 02:09:22 +03:00
..
.cvsignore
CMakeLists.txt
ha_myisammrg.cc	Backport of:	2009-12-03 02:09:22 +03:00
ha_myisammrg.h	Backport of:	2009-12-03 02:09:22 +03:00
make-ccc
Makefile.am
myrg_close.c
myrg_create.c
myrg_def.h
myrg_delete.c
myrg_extra.c	Backport of:	2009-12-03 02:09:22 +03:00
myrg_info.c
myrg_locking.c
myrg_open.c
myrg_panic.c
myrg_queue.c
myrg_range.c
myrg_records.c
myrg_rfirst.c
myrg_rkey.c
myrg_rlast.c
myrg_rnext.c
myrg_rnext_same.c
myrg_rprev.c
myrg_rrnd.c
myrg_rsame.c
myrg_static.c
myrg_update.c
myrg_write.c
plug.in