6 Commits

Author	SHA1	Message	Date
Sergei Golubchik	0fdb3bcfdb	10.0-base merge (roles)	2013-10-29 15:08:44 +01:00
Sergei Golubchik	b7b5f6f1ab	10.0-monty merge ... includes: * remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING" * introduce LOCK_share, now LOCK_ha_data is strictly for engines * rea_create_table() always creates .par file (even in "frm-only" mode) * fix a 5.6 bug, temp file leak on dummy ALTER TABLE	2013-07-21 16:39:19 +02:00
Sergei Golubchik	5f6380adde	10.0-base merge	2013-07-18 16:46:57 +02:00
Michael Widenius	5f1f2fc0e4	Applied all changes from Igor and Sanja	2013-06-15 18:32:08 +03:00
Sergei Golubchik	e1f681c99b	10.0-base -> 10.0-monty	2012-10-19 20:38:59 +02:00
Michael Widenius	60589aeee0	Next part of merge. See TODO for details	2012-08-14 17:23:34 +03:00