summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lindström <jplindst@mariadb.org>2013-10-01 13:24:52 +0300
committerJan Lindström <jplindst@mariadb.org>2013-10-01 13:24:52 +0300
commit9538bbfce9055f99529adb461d101b7b236eb5a3 (patch)
tree31db9ee47ab088ce0493c5e87bd9a60105e569fb
parentf6b65232c77336dee9eabff050a01091b2501f57 (diff)
downloadmariadb-git-9538bbfce9055f99529adb461d101b7b236eb5a3.tar.gz
MDEV-4808: Assertion: trx->start_file != 0 fails in trx0trx.cc on killing CREATE TABLE query.
Analysis: There is debug assertion ut_ad(trx->start_file != 0); and ut_ad(trx->start_line != 0); on trx_start_low funcition at trx0trx.cc. These fields are initialized on include/trx0trx.h at function trx_start_if_not_started_xa. Thus at trx_prepare_for_mysql function should call trx_start_if_not_started_xa(trx); not trx_start_if_not_started_xa_low(trx) directly;
-rw-r--r--storage/innobase/trx/trx0trx.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc
index 449b970842a..2dfa78b229a 100644
--- a/storage/innobase/trx/trx0trx.cc
+++ b/storage/innobase/trx/trx0trx.cc
@@ -1872,7 +1872,7 @@ trx_prepare_for_mysql(
/*==================*/
trx_t* trx) /*!< in/out: trx handle */
{
- trx_start_if_not_started_xa_low(trx);
+ trx_start_if_not_started_xa(trx);
trx->op_info = "preparing";