Please hold the review until after 1.1.5 has been released.

For QA: Best way to trigger this is to execute test/mcol1408 and after about 20 seconds run "killall WriteEngineServ". Before the patch the execution will get stuck in an endless loop, using 100% CPU time for a core. After the patch an error will occur and the test will fail and exit.

Build verified: GitHub source

/root/columnstore/mariadb-columnstore-server
commit 1741c7e7d522d1245ec9c1e4c7c7474574f09bd2
Merge: 2adc4b5 6abef48
Author: benthompson15 <ben.thompson@mariadb.com>
Date: Tue Jun 19 09:51:48 2018 -0500

Merge pull request #113 from mariadb-corporation/davidhilldallas-patch-3

update readme

/root/columnstore/mariadb-columnstore-server/mariadb-columnstore-engine
commit 845af99fa29160a6d965511a39bb91d2d70cd175
Merge: 2388de2 9e3f92b
Author: David.Hall <david.hall@mariadb.com>
Date: Mon Jun 25 10:13:16 2018 -0500

Merge pull request #508 from mariadb-corporation/MCOL-1330

MCOL-1330 Make debug flag let valgrind work

/root/mariadb-columnstore-tools
commit 0d1ae73afa9521df7002d32b208f859510d54c0a
Author: david hill <david.hill@mariadb.com>
Date: Mon Jun 18 17:05:29 2018 -0500

update version

diff --git a/VERSION b/VERSION
index aef96ee..8a397bd 100644
— a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
COLUMNSTORE_VERSION_MAJOR=1
COLUMNSTORE_VERSION_MINOR=1
-COLUMNSTORE_VERSION_PATCH=5
+COLUMNSTORE_VERSION_PATCH=6
COLUMNSTORE_VERSION_RELEASE=1
/root/mariadb-columnstore-api
commit 819db90bf93cef466b8d5068f0e5ad283b2065a5
Merge: 34382d9 e7c2eb9
Author: sneJ p <sneJ-@users.noreply.github.com>
Date: Wed Jun 20 14:49:54 2018 +0200

Merge pull request #81 from mariadb-corporation/MCOL-1195

MCOL-1195 Clean up TXN when table already locked

Verified per instruction for QA.