[MCOL-802] Merge MariaDB 10.1.25 into 1.0 Created: 2017-07-05  Updated: 2017-07-13  Resolved: 2017-07-13

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

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

Sprint: 2017-14

 Description   

MariaDB 10.1.25 has just been released. It needs to be merged into 1.0.

 Comments   
Comment by Daniel Lee (Inactive) [ 2017-07-13 ]

Builds tested: Github source 1.0.10, 1.1.0

1.0.10-1

[root@localhost mariadb-columnstore-server]# git show
commit 435972e50ee33911ce39696ce101d1cd23ed9c2b
Merge: b1d1ca1 5d3fcfe
Author: David.Hall <david.hall@mariadb.com>
Date: Wed Jul 12 13:07:55 2017 -0500

[root@localhost mariadb-columnstore-engine]# git show
commit 3501c1a17a920ee765c6255c5a5fd8c64fed7c8e
Author: david hill <david.hill@mariadb.com>
Date: Wed Jul 12 09:52:28 2017 -0500

1.1.0-1

[root@localhost mariadb-columnstore-server]# git show
commit 8e07495da650d922c4d1f3f09d77382168132b11
Merge: 80e57a8 c27e1e5
Author: David.Hall <david.hall@mariadb.com>
Date: Wed Jul 12 13:07:42 2017 -0500

[root@localhost mariadb-columnstore-engine]# git show
commit d1386928dcaf1d9acc92ab11e2415c808c75dd49
Author: david hill <david.hill@mariadb.com>
Date: Thu Jul 13 11:20:08 2017 -0500

[root@localhost ~]# mcsmysql mytest
Welcome to the MariaDB monitor. Commands end with ; or \g.
Your MariaDB connection id is 14
Server version: 10.1.25-MariaDB Columnstore 1.0.10-1

1.1.0-1 is showing MariaDB 10.2.6.

Comment by Daniel Lee (Inactive) [ 2017-07-13 ]

Merge applied to both branches?

Comment by Daniel Lee (Inactive) [ 2017-07-13 ]

The merge is for 1.0.10 only. 1.1.0 has been removed from the "Fixed version" field.

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