Andrew Hutchings
2e2d7f3289
MCOL-812 Escape slash as well as single quote
...
Previous attempt at fix only escaped quote
2017-08-03 20:37:12 +01:00
Andrew Hutchings
eaf491c1a4
MCOL-812 Escape slash as well as single quote
...
Previous attempt at fix only escaped quote
2017-08-03 20:35:38 +01:00
David.Hall
f2e7feffd6
Merge pull request #224 from mariadb-corporation/MCOL-857-1.1
...
MCOL-857 Fix thread leak on ByteStream exception
2017-08-03 12:40:14 -05:00
David.Hall
b4bc5bc9e4
Merge pull request #223 from mariadb-corporation/MCOL-857
...
MCOL-857 Fix thread leak on ByteStream exception
2017-08-03 12:39:22 -05:00
Andrew Hutchings
93e1ff32a0
Merge pull request #222 from mariadb-corporation/MCOL-523
...
Mcol 523
2017-08-03 17:57:57 +01:00
Andrew Hutchings
d690a14eb9
MCOL-857 Fix thread leak on ByteStream exception
...
ByteStream::advance can throw an exception if there isn't enough data in
the buffer yet. PrimProc's BPP processor would not catch this causing a
thread to be leaked every time. This was happening on BPP destroy and
abort.
2017-08-03 17:49:55 +01:00
Andrew Hutchings
3d3142e29a
MCOL-857 Fix thread leak on ByteStream exception
...
ByteStream::advance can throw an exception if there isn't enough data in
the buffer yet. PrimProc's BPP processor would not catch this causing a
thread to be leaked every time. This was happening on BPP destroy and
abort.
2017-08-03 17:47:56 +01:00
David Hall
e49edf19c8
MCOL-523 set copyright notices
2017-08-03 11:36:19 -05:00
Ben Thompson
90a04235eb
handle glusterAssign/glusterUnassign in cases where device is already mounted or not mounted yet
2017-08-03 11:01:47 -05:00
david hill
73d1dcde4a
MCOL-850
2017-08-03 09:46:36 -05:00
David Hall
b401a9293c
MCOL-523 Add back in initial reset for UDAF calls without GROUP BY
2017-08-02 14:57:07 -05:00
David Hall
211cde5b05
MCOL-523 merge conflict
2017-08-02 12:17:21 -05:00
David Hall
9c302b15ec
MCOL-523 fix a comment
2017-08-02 12:14:13 -05:00
David Hall
f428cdc371
MCOL-523 fix a merge issue, MEDIAN test for empty set.
2017-08-02 12:12:00 -05:00
David Hall
f85b3c655a
rebase develop
2017-08-02 11:39:36 -05:00
David Hall
bea6bff085
MCOL-523 don't set empty object as default
2017-08-02 11:32:06 -05:00
David Hall
108fbcf572
MCOL-523 Add UDAF and UDAnF SDK
2017-08-02 11:30:57 -05:00
David Hall
bc2a4e7795
MCOL-523 Add UDAF and UDAnF SDK
2017-08-02 11:22:07 -05:00
David.Hall
630b113565
Merge pull request #221 from mariadb-corporation/MCOL-840
...
MCOL-840 Fix incompatible join on expression
2017-08-01 12:29:15 -05:00
Andrew Hutchings
6aeb1bfa3a
MCOL-840 Fix incompatible join on expression
...
This check was removed but is actually still required in some cases.
2017-08-01 14:48:24 +01:00
David.Hall
606846e27f
Merge pull request #214 from mariadb-corporation/MCOL-830
...
MCOL-830 Allow cross engine to work with UTF8
2017-07-31 13:11:11 -05:00
David.Hall
12d98d5a4e
Merge pull request #215 from mariadb-corporation/MCOL-830-1.0
...
MCOL-830 Allow cross engine to work with UTF8
2017-07-31 13:10:57 -05:00
David.Hall
e4cd7d3313
Merge pull request #216 from mariadb-corporation/MCOL-812
...
MCOL-812 Escape cross engine filters
2017-07-31 13:10:07 -05:00
David.Hall
857d912f5f
Merge pull request #217 from mariadb-corporation/MCOL-812-1.1
...
MCOL-812 Escape cross engine filters
2017-07-31 13:09:54 -05:00
David.Hall
1ccb9676a4
Merge pull request #220 from mariadb-corporation/MCOL-838
...
MCOL-838 Enforce copy of string in StringStore
2017-07-31 09:07:32 -05:00
Andrew Hutchings
cc1cbaa160
MCOL-838 Enforce copy of string in StringStore
...
Since we aren't using C++11 the deserialize was doing using reference
counts for string copy which occasionally caused a use after free.
2017-07-31 06:38:21 +01:00
david hill
d60f402d01
merge 1.0.10 into master
2017-07-28 17:09:02 -05:00
David.Hall
63a207532e
Merge pull request #219 from mariadb-corporation/MCOL-834b-1.0
...
MCOL-834 Fix crashes introduced
2017-07-27 17:30:39 -05:00
David.Hall
470082df81
Merge pull request #218 from mariadb-corporation/MCOL-834b
...
MCOL-834 Fix crashes introduced
2017-07-27 17:30:23 -05:00
Andrew Hutchings
be7b83f89a
MCOL-834 Fix crashes introduced
...
* Fix race condition in cleanup
* Fix mutex cleanup crash
2017-07-27 23:24:30 +01:00
Andrew Hutchings
bc80fd99dc
MCOL-834 Fix crashes introduced
...
* Fix race condition in cleanup
* Fix mutex cleanup crash
2017-07-27 23:22:45 +01:00
david hill
7bd0c8a3d0
Merge pull request #212 from mariadb-corporation/MCOL-766
...
MCOL-766 Fix Debian 8 building
2017-07-27 14:39:40 -05:00
David Hall
9f81369963
MCOL-523 don't set empty object as default
2017-07-27 13:11:44 -05:00
david hill
4bd6e1959e
chmod of logrotate file
2017-07-27 11:13:48 -05:00
David Hill
fd018011a7
MCOL-715 - merged fix from 1.0.10
2017-07-27 10:53:55 -05:00
David Hill
67e8cb5bfc
MCOL-815 - MERGED CODE FROM 1.0.10
2017-07-27 10:40:58 -05:00
Andrew Hutchings
b39a8c2fbc
MCOL-812 fix typo
2017-07-27 16:26:57 +01:00
David Hill
f17c2e1820
MCOL-787 - merged code from 1.0.10
2017-07-27 10:26:43 -05:00
Andrew Hutchings
80bdfdf156
MCOL-812 fix typo
2017-07-27 16:26:34 +01:00
Andrew Hutchings
640a66a29e
MCOL-812 Escape cross engine filters
...
Quote marks in cross engine where conditions need to be escaped
2017-07-27 16:14:40 +01:00
Andrew Hutchings
668133d915
MCOL-812 Escape cross engine filters
...
Quote marks in cross engine where conditions need to be escaped
2017-07-27 16:13:01 +01:00
Andrew Hutchings
2aacb56bc6
MCOL-830 Allow cross engine to work with UTF8
...
UTF8 characters just showed as question marks. This patch makes them
retrieve correctly.
2017-07-27 14:59:10 +01:00
Andrew Hutchings
5f166733f7
MCOL-830 Allow cross engine to work with UTF8
...
UTF8 characters just showed as question marks. This patch makes them
retrieve correctly.
2017-07-27 14:26:30 +01:00
david hill
478b6ff5fa
Merge branch 'develop' of https://github.com/mariadb-corporation/mariadb-columnstore-engine into develop
2017-07-26 16:23:15 -05:00
david hill
c8b2527f13
mcol-833 - merge code from 1.0 for missing file fix
2017-07-26 16:22:51 -05:00
David Hill
842838e5ce
MCOL-833 - fix code merge issue
2017-07-26 15:30:01 -05:00
david hill
26ac4aa31c
mcol-833 - merge code from 1.0 for missing file fix
2017-07-26 15:03:52 -05:00
Andrew Hutchings
99c02f00d1
MCOL-766 Fix Debian 8 building
...
Debian 8 has Snappy in a different package name. In 1.1 we use the
distro version of Snappy so we have to check for this on package
building.
2017-07-26 20:57:45 +01:00
David Hall
445044bb3a
rebase with develop
2017-07-26 12:27:08 -05:00
David Hall
786152480a
MCOL-523 Add UDAF and UDAnF SDK
2017-07-26 12:17:38 -05:00
