From 60c9485a8e5ebf410d9fa60caa7937f3fe3ca9b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Tue, 1 Aug 2017 11:39:10 +0300 Subject: Merge connect/10.0 into 10.0 Squash all connect/10.0's commits into one and keep only changes from storage/connect directory. --- storage/connect/global.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'storage/connect/global.h') diff --git a/storage/connect/global.h b/storage/connect/global.h index a2030fdb5d0..cb756494efc 100644 --- a/storage/connect/global.h +++ b/storage/connect/global.h @@ -1,6 +1,7 @@ /***********************************************************************/ /* GLOBAL.H: Declaration file used by all CONNECT implementations. */ -/* (C) Copyright Olivier Bertrand 1993-2017 */ +/* (C) Copyright MariaDB Corporation Ab */ +/* Author Olivier Bertrand 1993-2017 */ /***********************************************************************/ /***********************************************************************/ @@ -90,6 +91,7 @@ #define TYPE_BIGINT 5 #define TYPE_LIST 6 #define TYPE_INT 7 +#define TYPE_DATE 8 #define TYPE_DECIM 9 #define TYPE_BIN 10 #define TYPE_PCHAR 11 -- cgit v1.2.1