diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-02-07 11:33:52 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-02-07 11:33:52 +0100 |
| commit | 35548d577c77c1bb7cecbadafb9a8519cc0f3710 (patch) | |
| tree | 722545b66c948d3330b44b6580ebab79633e1721 /storage/connect/odbconn.cpp | |
| parent | 22367ba71f8eb995f50209143122003a7ad7f74c (diff) | |
| download | mariadb-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/odbconn.cpp')
| -rw-r--r-- | storage/connect/odbconn.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp index 79b99d79309..59cd2b0d157 100644 --- a/storage/connect/odbconn.cpp +++ b/storage/connect/odbconn.cpp @@ -53,6 +53,8 @@ extern "C" HINSTANCE s_hModule; // Saved module handle #endif // WIN32 +int GetConvSize(); + /***********************************************************************/ /* Some macro's (should be defined elsewhere to be more accessible) */ /***********************************************************************/ @@ -122,7 +124,7 @@ int TranslateSQLType(int stp, int prec, int& len, char& v) case SQL_LONGVARCHAR: // (-1) v = 'V'; type = TYPE_STRING; - len = MY_MIN(abs(len), 256); + len = MY_MIN(abs(len), GetConvSize()); break; case SQL_NUMERIC: // 2 case SQL_DECIMAL: // 3 |