Andrew Hutchings
d6cb205dfc
MCOL-1475 Improve cross engine error handling
...
Now shows MariaDB error code and message where possible.
2018-06-14 18:37:52 +01:00
Andrew Hutchings
60a4d14e85
Merge pull request #493 from mariadb-corporation/MCOL-1201-b
...
Mcol 1201 b
2018-06-07 17:40:45 +01:00
David Hall
58f10055aa
MCOL-1201 Add regr_avgx to included functions
2018-06-07 10:05:35 -05:00
Andrew Hutchings
e2141e0b69
MCOL-1418 Fix negative time storage for LDI
2018-06-07 12:41:44 +01:00
David Hall
5b3db71c8f
MCOL-1201 fix some regressions
2018-06-06 10:34:35 -05:00
David Hall
554e31b4ec
MCOL-1201 rebase
2018-06-05 14:14:20 -05:00
David Hall
ea70806e93
MCOL-1201 Add support for UDAF multiple parm constants
2018-06-05 14:10:04 -05:00
David Hall
ec3a3846c3
MCOL-1201 manual rebase with develop. Obsoletes branch MCOL-1201
2018-06-05 14:06:58 -05:00
David Hall
c8c3b23e32
MCOL-1201 Modify docs. Fix group concat bug
2018-06-05 13:54:17 -05:00
David Hall
06e9772310
MCOL-1201 some fixes from testing
2018-06-05 13:54:17 -05:00
David Hall
6fa7dded6f
MCOL-1201 manual rebase with develop. Obsoletes branch MCOL-1201
2018-06-05 13:54:17 -05:00
David Hall
fb5f324010
MCOL-1201 Fix DISTINCT with UDAF multi-parm
2018-06-05 12:53:45 -05:00
Andrew Hutchings
6948ab85a3
MCOL-1427 Fix microsecond padding for display
...
We were padding from right, we needed to pad from left.
2018-06-04 19:57:42 +01:00
Andrew Hutchings
4764094e4a
Fix merge errors
2018-05-31 15:04:04 +01:00
Andrew Hutchings
1d8964ec0d
Fix code style
2018-05-31 14:44:48 +01:00
Andrew Hutchings
53f281933a
Merge branch 'develop-1.1' into 1.1-merge-up-20180531
2018-05-31 14:43:52 +01:00
Roman Nozdrin
1a1f3ea506
MCOL-1449. Fix the regression caused by changes in idborderby code for MCOL-1052. Add LIMIT and OFFSET support for group by handler.
2018-05-31 13:51:21 +03:00
Roman Nozdrin
efbf297eb7
MCOL-1384 Backport the MCOL-573 feature to 1.1. Change msg type to avoid server code assert violation.
2018-05-31 10:45:22 +03:00
david hill
fc8754065f
Merge branch 'develop' into MCOL-520
2018-05-30 09:28:07 -05:00
David Hall
0f617896d9
MCOL-1201 Add support for UDAF multiple parm constants
2018-05-25 12:56:29 -05:00
Roman Nozdrin
04c87aca31
MCOL-1406 Removed unused non-terminal token.
2018-05-25 12:28:00 +03:00
david hill
e70c947977
change to use local lock file directory for nonroot
2018-05-24 10:33:46 -05:00
Roman Nozdrin
8f3faee25d
MCOL-1406 Fixed the regression.
2018-05-23 23:38:11 +03:00
david hill
faef2f820a
change lock directory
2018-05-23 10:16:58 -05:00
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
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
8790177d2a
Merge pull request #471 from drrtuy/MCOL-1386
...
MCOL-1386 C-style comments
2018-05-15 15:32:47 +01: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
David Hall
82e8ab7518
MCOL-1201 manual rebase with develop. Obsoletes branch MCOL-1201
2018-05-11 09:50:10 -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
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
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
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
c2b9016430
Merge branch 'develop' into MCOL-1052
2018-05-05 06:29:04 +01:00
Roman Nozdrin
00990ca5bd
MCOL-1052 GROUP BY handler returns NULL values properly.
2018-05-03 22:35:41 +03: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
Andrew Hutchings
f68f80eb00
MCOL-392 Add back accidental removal of function
2018-05-01 20:56:52 +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
dfc351b730
MCOL-392 fix negative zero hours
...
Also fix some functions that were not behaving correctly
2018-04-30 22:08:10 +01:00