summaryrefslogtreecommitdiff
path: root/storage/connect/checklvl.h
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2015-02-07 11:33:52 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2015-02-07 11:33:52 +0100
commit35548d577c77c1bb7cecbadafb9a8519cc0f3710 (patch)
tree722545b66c948d3330b44b6580ebab79633e1721 /storage/connect/checklvl.h
parent22367ba71f8eb995f50209143122003a7ad7f74c (diff)
downloadmariadb-git-35548d577c77c1bb7cecbadafb9a8519cc0f3710.tar.gz
- Modify the connect_type_conv and connect_conv_size variables.
They were global (read-only) now they are session (not read-only) modified: storage/connect/checklvl.h storage/connect/ha_connect.cc storage/connect/myconn.cpp storage/connect/myutil.cpp storage/connect/tabutil.cpp - Suppress the compver variable on Linux compile. Was not debian reproductible because using __DATE__ and __TIME__ macros. modified: storage/connect/ha_connect.cc - ODBC LONGVARVAR type conversion now uses connect_conv_size. modified: storage/connect/odbconn.cpp
Diffstat (limited to 'storage/connect/checklvl.h')
-rw-r--r--storage/connect/checklvl.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/storage/connect/checklvl.h b/storage/connect/checklvl.h
index d1e37afbc93..0c234dfb8b8 100644
--- a/storage/connect/checklvl.h
+++ b/storage/connect/checklvl.h
@@ -40,4 +40,11 @@ enum USETEMP {TMP_NO = 0, /* Never */
TMP_FORCE = 3, /* Forced for MAP tables */
TMP_TEST = 4}; /* Testing value */
+/***********************************************************************/
+/* Following definitions indicate conversion of TEXT columns. */
+/***********************************************************************/
+enum TYPCONV {TPC_NO = 0, /* Never */
+ TPC_YES = 1, /* Always */
+ TPC_SKIP = 2}; /* Skip TEXT columns */
+
#endif // _CHKLVL_DEFINED_