[MCOL-1159] Merge MariaDB 10.2.12 Created: 2018-01-15  Updated: 2018-01-19  Resolved: 2018-01-19

Status: Closed
Project: MariaDB ColumnStore
Component/s: None
Affects Version/s: None
Fix Version/s: 1.1.3

Type: Task Priority: Major
Reporter: Andrew Hutchings (Inactive) Assignee: Daniel Lee (Inactive)
Resolution: Fixed Votes: 0
Labels: None

Sprint: 2018-02

 Description   

MariaDB 10.2.12 needs merging into develop-1.1

 Comments   
Comment by Ben Thompson (Inactive) [ 2018-01-19 ]

Merged to 1.1

Comment by Daniel Lee (Inactive) [ 2018-01-19 ]

Build verified: Github source 1.1.3-1

/root/columnstore/mariadb-columnstore-server
commit e0ae0d2fecf9941887478d9aa669c8b2d1092090
Merge: 21ec501 2490ddf
Author: benthompson15 <ben.thompson@mariadb.com>
Date: Fri Jan 19 12:39:05 2018 -0600

Merge pull request #84 from mariadb-corporation/MCOL-1159

MCOL-1159 Merge mariadb-10.2.12

/root/columnstore/mariadb-columnstore-server/mariadb-columnstore-engine
commit 201813d63d63e99e50f2474d1bf7d8428ac72119
Merge: 3748036 a002d33
Author: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Fri Jan 19 19:40:18 2018 +0000

Merge pull request #373 from mariadb-corporation/MergeFix

Merge deleted change to include columnstoreversion.h

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

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

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

Generated at Thu Feb 08 02:26:39 UTC 2024 using Jira 8.20.16#820016-sha1:9d11dbea5f4be3d4cc21f03a88dd11d8c8687422.