David Hall
b626f1c8e7
Merge branch 'MCOL-1201-b' of https://github.com/mariadb-corporation/mariadb-columnstore-engine into MCOL-1201-b
2018-05-17 16:06:01 -05:00
David Hall
bac8c2d43b
MCOL-1201 Modify docs. Fix group concat bug
2018-05-17 15:50:35 -05:00
David Hall
40aca95a7a
MCOL-1201 some fixes from testing
2018-05-17 15:50:35 -05:00
David Hall
956db53dfd
MCOL-1201 Add test UDAF back in after rebase
2018-05-17 15:50:35 -05:00
David Hall
51df837b4e
MCOL-1201 manual rebase with develop. Obsoletes branch MCOL-1201
2018-05-17 15:50:35 -05:00
Roman Nozdrin
59858aa896
MCOL-1415 Fixed regression with extra spaces after dot in qualified identifiers.
2018-05-17 10:01:17 +03:00
David Hall
1c7ec0ddc6
MCOL-1201 Modify docs. Fix group concat bug
2018-05-15 13:15:45 -05:00
Andrew Hutchings
e79daac8a9
Merge pull request #472 from drrtuy/MCOL-1073
...
MCOL-1073 Removed DecomSrv
2018-05-15 15:34:19 +01:00
Andrew Hutchings
8790177d2a
Merge pull request #471 from drrtuy/MCOL-1386
...
MCOL-1386 C-style comments
2018-05-15 15:32:47 +01:00
david hill
45331160af
Merge pull request #473 from mariadb-corporation/MCOL-1412
...
MCOL-1412 Ubuntu 18.04 support
2018-05-15 08:35:51 -05:00
Roman Nozdrin
7bdc60eb14
Merge pull request #466 from mariadb-corporation/1.1-merge-up-20180509-a2
...
Merge develop-1.1 into develop
2018-05-15 12:56:49 +03:00
David Hall
6ccfbb2a23
MCOL-1201 some fixes from testing
2018-05-14 17:28:24 -05:00
Andrew Hutchings
5b1f5d5fe4
MCOL-1412 Ubuntu 18.04 support
...
Backport Ubuntu 18.04 support to 1.1
2018-05-14 22:03:25 +01:00
Roman Nozdrin
8a3c5e08e2
MCOL-1073 DecomSvr service was removed.
2018-05-13 22:02:08 +03:00
David Hall
30f9aa71cd
MCOL-1201 Add test UDAF back in after rebase
2018-05-11 09:53:49 -05:00
David Hall
82e8ab7518
MCOL-1201 manual rebase with develop. Obsoletes branch MCOL-1201
2018-05-11 09:50:10 -05:00
David.Hall
32feb09e91
Merge pull request #470 from mariadb-corporation/MCOL-1390
...
MCOL-1390 Fix SUBSTRING_INDEX for negative count
2018-05-10 15:46:18 -05:00
David.Hall
61da44cd61
Merge pull request #469 from mariadb-corporation/MCOL-1403
...
MCOL-1403 Remove whitespace trimming on constants
2018-05-10 15:37:18 -05:00
Roman Nozdrin
f67c9fd50f
MCOL-1386 Add c-style comments support for DDL statements.
2018-05-10 22:04:33 +03:00
Andrew Hutchings
baf42e7b4a
MCOL-1390 Fix SUBSTRING_INDEX for negative count
...
If negative count number is more than the number of characters in the
string then it should always return the string.
For example if a table contains SUBSTRING_INDEX('zzz', 'z', -5) should
return 'zzz'. Before this patch it would return NULL.
2018-05-10 18:32:22 +01:00
Andrew Hutchings
fbf2f2e979
MCOL-1403 Remove whitespace trimming on constants
...
This appears to be to fix equality matches in InfiniDB but at the same
time it breaks LIKE processing. Equality matching with trailing
whitespace was fixed in MCOL-1246 so the old InfiniDB patch can be
removed.
2018-05-10 17:35:38 +01:00
David.Hall
d8d386b960
Merge pull request #468 from mariadb-corporation/MCOL-1402
...
MCOL-1402 Fix addtime/subtime
2018-05-09 15:13:47 -05:00
Andrew Hutchings
305bae1bcb
MCOL-1402 Fix addtime/subtime
...
The changes to addtime/subtime for TIME datatype broke the handling of
the adding and subtracting of time. This fixes that.
2018-05-09 20:34:56 +01:00
David.Hall
e66cceb1a3
Merge pull request #467 from mariadb-corporation/MCOL-1197
...
MCOL-1197 Make -c work in cpimport
2018-05-09 11:34:32 -05:00
Andrew Hutchings
d010397be6
MCOL-1197 Make -c work in cpimport
...
It turns out -c wasn't actually connected to anything and now with have
BLOB/TEXT it is pretty useful. If -c is set to < 1MB then 1MB is used,
otherwise it will use the selected buffer size.
2018-05-09 14:52:42 +01:00
Andrew Hutchings
6c22502cb9
More fixes due to bad merging
2018-05-09 09:55:24 +01:00
Andrew Hutchings
bb06ac4de4
Fix another merge error
2018-05-09 09:47:07 +01:00
Andrew Hutchings
1ac28c4f26
Fix indentation
2018-05-09 09:28:30 +01:00
Andrew Hutchings
1a582eed4a
Merge branch 'develop-1.1' into 1.1-merge-up-20180509-a2
2018-05-09 09:20:55 +01:00
David.Hall
3227421dea
Merge pull request #465 from mariadb-corporation/MCOL-1396
...
MCOL-1396 Allow StringStore to hold more than 2GB
2018-05-08 23:14:41 -05:00
Andrew Hutchings
ac3e702a3e
MCOL-1396 Allow StringStore to hold more than 2GB
...
StringStore originally worked by returning a 32bit pointer to a memory
location and storing the length with that pointer. This allowed 4GB to
be stored in 64KB blocks. With 1.1 we used the high bit to signify a
TEXT/BLOB string of > 64KB reducing the max capacity to 2GB but without
any bounds checking.
So, if you went over the 2GB mark the getter would think you are trying
to get a long string instead of a short one and come up empty. It would
then return NULL.
This patch uses 64bit memory points still retaining the high bit to
signify long strings. It also now stores the length with the string
rather than with the pointer to allow the full 64bits for pointers.
It also adds a bounds check for small strings.
2018-05-08 19:38:06 +01:00
Andrew Hutchings
dee81db2f6
Merge pull request #464 from drrtuy/MCOL-1384
...
MCOL-1384 Parser accepts quotes with qualified dbobject identifiers.
2018-05-08 11:23:41 +01:00
David.Hall
24b8c790d5
Merge pull request #459 from mariadb-corporation/MCOL-1376
...
MCOL-1376 Fix compiler errors in Ubuntu 18.04
2018-05-07 12:13:34 -05:00
Roman Nozdrin
b9f2b55484
MCOL-1384 Parser accepts quotes with qualified dbobject identifiers.
2018-05-07 11:56:54 +03:00
Andrew Hutchings
e785ed8772
Merge pull request #462 from drrtuy/MCOL-1052
...
MCOL-1052 GROUP BY pushdown handler
2018-05-05 06:29:30 +01:00
Andrew Hutchings
c2b9016430
Merge branch 'develop' into MCOL-1052
2018-05-05 06:29:04 +01:00
benthompson15
f1b05a7c09
Merge pull request #461 from mariadb-corporation/MCOL-1377
...
MCOL-1377 - enchance the user/group setting for syslog
2018-05-03 19:47:26 -05:00
Roman Nozdrin
00990ca5bd
MCOL-1052 GROUP BY handler returns NULL values properly.
2018-05-03 22:35:41 +03:00
david hill
543f6cb8dd
MCOL-1377 - enchance the user/group setting for syslog
2018-05-03 09:06:45 -05:00
david hill
6613a9f7e7
MCOL-520 - nonroot changes without sudo
2018-05-02 10:37:25 -05:00
David.Hall
69519426be
Merge pull request #460 from mariadb-corporation/MCOL-1349
...
MCOL-1349 Fix outer joins in views
2018-05-02 10:14:48 -05:00
Andrew Hutchings
0b32f95dac
MCOL-1349 Fix outer joins in views
...
Outer join handling inside views was broken due to the joins being
processed twice. This patch brings back the code so that outer joins in
views are only processed once.
2018-05-02 15:26:01 +01:00
Andrew Hutchings
b83c21d891
MCOL-1376 Fix compiler errors in Ubuntu 18.04
...
Ubuntu 18.04 uses GCC 7.3 which is a little stricter than before.
Fixes a few errors due to implicit includes that are no longer implicit
and a ton of warnings about the implied alignment of code in
utils/common/any.hpp
2018-05-02 09:40:27 +01:00
David.Hall
47ccb3f259
Merge pull request #458 from mariadb-corporation/MCOL-392
...
MCOL-392 Add TIME data type and microsecond support
2018-05-01 15:17:29 -05:00
Andrew Hutchings
f68f80eb00
MCOL-392 Add back accidental removal of function
2018-05-01 20:56:52 +01:00
Andrew Hutchings
4a1fc5b84d
Merge pull request #455 from mariadb-corporation/MCOL-1229-1.1
...
MCOL-1229 - IS.columnstore_columns crashes when DDL is simultaneously…
2018-05-01 13:08:05 +01:00
Andrew Hutchings
c40903de9b
MCOL-392 Apply astyle
...
Make this branch apply our style guidelines
2018-05-01 09:52:26 +01:00
Andrew Hutchings
4ef4286022
MCOL-392 Fix time_to_sec() for negative time
2018-05-01 07:25:25 +01:00
Andrew Hutchings
dfc351b730
MCOL-392 fix negative zero hours
...
Also fix some functions that were not behaving correctly
2018-04-30 22:08:10 +01:00
Ravi Prakash
fda6b35243
More change for MCOL-1229. Do not throw an exception but return an error code.
2018-04-30 10:39:13 -07:00