Three branches:

• regression suite: see pull request
• engine: see pull request
• server: MCOL-1385-server branch

MCOL-1385-server branch is taken from the 10.3.8 tag and then a ColumnStore patch applied on top. This means when a new release comes out we can easily rebase instead of merging. This also means that we will need to replace develop with this branch in the server tree instead of merging.

Therefore if the review is good please approve and not merge and I will coordinate with DT to get all the pieces in place.

The only remaining test failures I can see at the moment are due to things that haven't been merged up into develop and things we already know are broken in develop / develop regression suite.

Build verified: 1.2.0-1 source

/root/columnstore/mariadb-columnstore-server
commit c2052269ef995332eedbef4fbd3ecc4a5e8e8cf0
Merge: b8fded1 d0385eb
Author: benthompson15 <ben.thompson@mariadb.com>
Date: Mon Sep 10 09:07:03 2018 -0500

Merge pull request #131 from mariadb-corporation/build_fix

Revert "MDEV-11036 Add link wsrep_sst_rsync_wan -> wsrep_sst_rsync"

/root/columnstore/mariadb-columnstore-server/mariadb-columnstore-engine
commit 764090ba0cf0bbb99092f5bfd9f8014464a136b1
Merge: 73b45ac 5b682a5
Author: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Mon Sep 3 16:20:47 2018 +0100

Merge pull request #552 from drrtuy/MCOL-1510_4

MCOL-1510: Add CalpontSelectExecutionPlan::serialize() changes.

[root@localhost ~]# mcsmysql
Welcome to the MariaDB monitor. Commands end with ; or \g.
Your MariaDB connection id is 13
Server version: 10.3.8-MariaDB-log Columnstore 1.2.0-1

Copyright (c) 2000, 2018, Oracle, MariaDB Corporation Ab and others.

Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.

This test only verified the code is merged. Any issues found, if any, will be track separately.