hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source
This commit is contained in:
Johan Wikman
2018-03-21 13:27:51 +02:00
parent 2cc0c5f1aa 041b775150
commit a996ea58ef
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION21.cmake
View File

@ -5,7 +5,7 @@
set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version") set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
set(MAXSCALE_VERSION_MINOR "1" CACHE STRING "Minor version") set(MAXSCALE_VERSION_MINOR "1" CACHE STRING "Minor version")
set(MAXSCALE_VERSION_PATCH "15" CACHE STRING "Patch version") set(MAXSCALE_VERSION_PATCH "16" CACHE STRING "Patch version")
# This should only be incremented if a package is rebuilt # This should only be incremented if a package is rebuilt
set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number") set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")

1
query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
View File

@ -615,6 +615,7 @@ columnid(A) ::= nm(X). {
BINARY BINARY
/*CASCADE*/ CAST CLOSE COLUMNKW COLUMNS COMMENT CONCURRENT /*CONFLICT*/ /*CASCADE*/ CAST CLOSE COLUMNKW COLUMNS COMMENT CONCURRENT /*CONFLICT*/
DATA /*DATABASE*/ DEALLOCATE DEFERRED /*DESC*/ /*DETACH*/ DUMPFILE DATA /*DATABASE*/ DEALLOCATE DEFERRED /*DESC*/ /*DETACH*/ DUMPFILE
/*EACH*/ END ENGINE ENUM EXCLUSIVE /*EXPLAIN*/
/*EACH*/ END ENUM EXCLUSIVE /*EXPLAIN*/ /*EACH*/ END ENUM EXCLUSIVE /*EXPLAIN*/
FIRST FLUSH /*FOR*/ FORMAT FIRST FLUSH /*FOR*/ FORMAT
GLOBAL GLOBAL

3
query_classifier/test/maxscale.test
View File

@ -97,3 +97,6 @@ select id from db2.t1 where DATE_ADD("2017-06-15", INTERVAL 10 DAY) < "2017-06-1
select id from db2.t1 where ADDDATE("2017-06-15", INTERVAL 10 DAY) < "2017-06-15"; select id from db2.t1 where ADDDATE("2017-06-15", INTERVAL 10 DAY) < "2017-06-15";
SELECT '2008-12-31 23:59:59' + INTERVAL 1 SECOND; SELECT '2008-12-31 23:59:59' + INTERVAL 1 SECOND;
SELECT '2005-01-01' - INTERVAL 1 SECOND; SELECT '2005-01-01' - INTERVAL 1 SECOND;
# MXS-1730
SELECT id as engine FROM users WHERE id = 1;