5 Commits

Author	SHA1	Message	Date
Sergei Golubchik	932646b1ff	Merge branch '10.1' into 10.2	2016-06-30 16:38:05 +02:00
Sergei Golubchik	22d7860d78	fix tokudb tests after the merge	2016-06-11 22:47:30 +02:00
Sergey Vojtovich	282497dd6d	MDEV-6720 - enable connection log in mysqltest by default	2016-03-31 10:11:16 +04:00
Sergei Golubchik	7a21364332	after-merge fix partitioning tests ... * use --sort_result in test files as needed * remove old and wrong mariadb-5.3 related partitioning hack from ha_tokudb.cc	2015-12-15 20:25:04 +01:00
Sergey Petrunya	41208f6e5b	MDEV-5426: Assertion `toku_ft_needed_unlocked(src_h)' failed (errno=11) ... ... - the problem was caused by EXPLAIN INSERT SELECT. For that statement, the code would call select_insert::prepare2(), which would call handler->ha_start_bulk_insert(). The corresponding handler->end_bulk_insert() call is made from select_insert::send_eof or select_insert::abort_result_set which are never called for EXPLAIN INSERT SELECT. - Fixed by re-using approach of mysql-5.6: don't call ha_start_bulk_insert() if we are in EXPLAIN.	2014-01-21 14:02:56 +04:00