diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2014-02-03 16:14:13 +0100 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-02-03 16:14:13 +0100 |
commit | 5133cb5e2530954a23b93ee22a49273f7333e36b (patch) | |
tree | 42b7b2654c305d6a19aa426d153300ad369b788c /storage/connect/plgcnx.h | |
parent | 4d5f5f4cdf8c99bf693fd78490524a72418f1f45 (diff) | |
download | mariadb-git-5133cb5e2530954a23b93ee22a49273f7333e36b.tar.gz |
This is a major update of CONNECT that goes from version 1.1 to 1.2
===================================================================
- Implement a first support of the ALTER TABLE command. This fixes MDEV-5440
but does much more than only that. See the details of how ALTER is supported
in the new documentation and also in MDEV-5440 comment.
This is done principally by implementing for CONNECT the virtual function
check_if_supported_inplace_alter.
modified:
storage/connect/connect.cc
storage/connect/global.h
storage/connect/ha_connect.cc
storage/connect/ha_connect.h
storage/connect/mysql-test/connect/r/bin.result
storage/connect/mysql-test/connect/r/csv.result
storage/connect/mysql-test/connect/r/dbf.result
storage/connect/mysql-test/connect/r/dir.result
storage/connect/mysql-test/connect/r/fix.result
storage/connect/mysql-test/connect/r/index.result
storage/connect/mysql-test/connect/r/ini.result
storage/connect/mysql-test/connect/r/occur.result
storage/connect/mysql-test/connect/r/pivot.result
storage/connect/mysql-test/connect/r/vec.result
storage/connect/mysql-test/connect/t/dbf.test
storage/connect/plugutil.c
storage/connect/user_connect.cc
- Fixes the tabname/table_name issue for XML tables. Implement
multiple files XML tables.
modified:
storage/connect/tabxml.cpp
storage/connect/tabxml.h
- Set to varchar(256) the fields of catalog tables stored
as STRBLK's (had length 0 --> CHAR(1))
Add the GetCharString function to the VALBLK class
modified:
storage/connect/ha_connect.cc
storage/connect/valblk.cpp
storage/connect/valblk.h
storage/connect/value.cpp
- Translate CONNECT error messages to system_charset
to avoid truncation on not ASCII characters.
modified:
storage/connect/ha_connect.cc
- Update version number
modified:
storage/connect/ha_connect.cc
storage/connect/mysql-test/connect/r/xml.result
- Move the TDBASE::data_charset body from xtable.h to table.cpp.
(dont' remember why)
modified:
storage/connect/table.cpp
storage/connect/xtable.h
- Other modifications are to enhance the support of OEM tables.
In particular, they can now provide column definition in dicovery.
modified:
storage/connect/colblk.h
storage/connect/global.h
storage/connect/ha_connect.cc
storage/connect/mycat.cc
storage/connect/plgcnx.h
storage/connect/plgdbsem.h
storage/connect/xtable.h
- Or to add or modify tracing.
modified:
storage/connect/filamtxt.cpp
storage/connect/ha_connect.cc
storage/connect/plgdbutl.cpp
storage/connect/tabfix.cpp
storage/connect/tabmysql.cpp
Diffstat (limited to 'storage/connect/plgcnx.h')
-rw-r--r-- | storage/connect/plgcnx.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/connect/plgcnx.h b/storage/connect/plgcnx.h index 7ce72b45268..fe3997d1986 100644 --- a/storage/connect/plgcnx.h +++ b/storage/connect/plgcnx.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* PLGCNX.H */ -/* Copyright to the author: Olivier Bertrand 2000-2012 */ +/* Copyright to the author: Olivier Bertrand 2000-2014 */ /* */ /* This is the connection DLL's declares. */ /**************************************************************************/ @@ -62,6 +62,7 @@ enum INFO {INDX_RC, /* Index of PlugDB return code field */ INDX_SIZE, /* Index of returned data size field */ INDX_MAX}; /* Size of info array */ +#ifdef NOT_USED /**************************************************************************/ /* Internal message types. */ /**************************************************************************/ @@ -97,9 +98,9 @@ enum VENDOR {VDR_UNKNOWN = -2, /* Not known or not connected */ /**************************************************************************/ enum CKEYS {K_ProgMsg, K_Lang, K_ActiveDB, K_Cmax}; enum LKEYS {K_NBcol, K_NBlin, K_CurPos, K_RC, K_Result, K_Elapsed, - K_Continued, K_Maxsize, K_Lmax, K_Maxcol, + K_Continued, K_Maxsize, K_Affrows, K_Lmax, K_Maxcol, K_Maxres, K_Maxlin, K_NBparm}; -enum NKEYS {K_Type, K_Length, K_Prec, K_DataLen, K_Nmax}; +enum NKEYS {K_Type, K_Length, K_Prec, K_DataLen, K_Unsigned, K_Nmax}; /**************************************************************************/ /* Result description structures. */ @@ -157,7 +158,6 @@ typedef struct _ResDesc { #define XTRN #endif -#ifdef NOT_USED //#if !defined(NO_FUNC) #ifdef __cplusplus extern "C" { @@ -172,7 +172,7 @@ XTRN bool CNXFUNC(PLGGetCharValue)(CNXKEY, char *, int, int); XTRN bool CNXFUNC(PLGGetIntValue)(CNXKEY, int *, int); XTRN bool CNXFUNC(PLGGetColValue) (CNXKEY, int *, int, int); XTRN bool CNXFUNC(PLGGetMessage) (CNXKEY, char *, int); -XTRN bool CNXFUNC(PLGGetHeader) (CNXKEY, char *, int, int); +XTRN bool CNXFUNC(PLGGetHeader) (CNXKEY, char *, int, int, int); #ifdef __cplusplus } |