Modified:
branches/guffert/ChangeLog
branches/guffert/setupgui/utils.c
branches/guffert/setupgui/windows/odbcdialogparams.cpp
branches/guffert/setupgui/windows/odbcdialogparams.rc
branches/guffert/setupgui/windows/resource.h
branches/guffert/util/installer.h
Log:
Added FLAG_NO_BINARY_RESUL connection option to always handle binary function results as
character data. (Bug #29402)
Modified: branches/guffert/ChangeLog
===================================================================
--- branches/guffert/ChangeLog 2008-07-30 16:33:26 UTC (rev 1133)
+++ branches/guffert/ChangeLog 2008-08-04 06:39:09 UTC (rev 1134)
@@ -1,6 +1,8 @@
5.1.5
Functionality added or changed:
+ * Added FLAG_NO_BINARY_RESUL connection option to always handle
+ binary function results as character data. (Bug #29402)
Bugs fixed:
* Some catalog functions used fixed-sized buffers for handling
Modified: branches/guffert/setupgui/utils.c
===================================================================
--- branches/guffert/setupgui/utils.c 2008-07-30 16:33:26 UTC (rev 1133)
+++ branches/guffert/setupgui/utils.c 2008-08-04 06:39:09 UTC (rev 1134)
@@ -58,6 +58,7 @@
params->limit_column_size= (nOptions & FLAG_COLUMN_SIZE_S32)
> 0;
params->enable_auto_reconnect= (nOptions & FLAG_AUTO_RECONNECT)
> 0;
params->enable_auto_increment_null_search= (nOptions & FLAG_AUTO_IS_NULL)
> 0;
+ params->handle_binary_as_char= (nOptions & FLAG_NO_BINARY_RESULT)
> 0;
}
@@ -246,6 +247,8 @@
nFlags|= FLAG_AUTO_RECONNECT;
if (params->enable_auto_increment_null_search)
nFlags|= FLAG_AUTO_IS_NULL;
+ if (params->handle_binary_as_char)
+ nFlags|= FLAG_NO_BINARY_RESULT;
return nFlags;
}
Modified: branches/guffert/setupgui/windows/odbcdialogparams.cpp
===================================================================
--- branches/guffert/setupgui/windows/odbcdialogparams.cpp 2008-07-30 16:33:26 UTC (rev
1133)
+++ branches/guffert/setupgui/windows/odbcdialogparams.cpp 2008-08-04 06:39:09 UTC (rev
1134)
@@ -228,6 +228,7 @@
GET_BOOL(1,safe);
GET_BOOL(1,enable_auto_reconnect);
GET_BOOL(1,enable_auto_increment_null_search);
+ GET_BOOL(1,handle_binary_as_char);
/* flags 2*/
GET_BOOL(2,dont_prompt_upon_connect);
GET_BOOL(2,enable_dynamic_cursor);
@@ -267,6 +268,7 @@
SET_BOOL(1,safe);
SET_BOOL(1,enable_auto_reconnect);
SET_BOOL(1,enable_auto_increment_null_search);
+ SET_BOOL(1,handle_binary_as_char);
/* flags 2*/
SET_BOOL(2,dont_prompt_upon_connect);
SET_BOOL(2,enable_dynamic_cursor);
Modified: branches/guffert/setupgui/windows/odbcdialogparams.rc
===================================================================
--- branches/guffert/setupgui/windows/odbcdialogparams.rc 2008-07-30 16:33:26 UTC (rev
1133)
+++ branches/guffert/setupgui/windows/odbcdialogparams.rc 2008-08-04 06:39:09 UTC (rev
1134)
@@ -75,6 +75,8 @@
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,87,105,10
CONTROL "Enable
SQL_AUTO_IS_NULL",IDC_CHECK_enable_auto_increment_null_search,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,102,105,10
+ CONTROL "Always handle binary function results as character
data",IDC_CHECK_handle_binary_as_char,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,117,194,10
END
IDD_TAB2 DIALOGEX 0, 0, 209, 151
Modified: branches/guffert/setupgui/windows/resource.h
===================================================================
--- branches/guffert/setupgui/windows/resource.h 2008-07-30 16:33:26 UTC (rev 1133)
+++ branches/guffert/setupgui/windows/resource.h 2008-08-04 06:39:09 UTC (rev 1134)
@@ -23,32 +23,16 @@
#define IDD_TAB4 134
#define IDD_TAB5 136
#define IDC_LOGO 1000
-#define IDC_EDIT4 1004
#define IDC_EDIT_DRVNAME 1004
-#define IDC_EDIT5 1005
#define IDC_EDIT_DRVDESC 1005
-#define IDC_EDIT6 1006
-#define IDC_EDIT7 1007
#define IDC_EDIT_SRVNAME 1007
-#define IDC_EDIT8 1008
#define IDC_EDIT_PORT 1008
-#define IDC_EDIT9 1009
#define IDC_EDIT_USERNAME 1009
-#define IDC_EDIT10 1010
#define IDC_EDIT 1010
#define IDC_EDIT_PASSWORD 1010
-#define IDC_EDIT11 1011
#define IDC_EDIT_DBNAME 1011
#define IDC_BUTTON_DETAILS 1012
#define IDC_TAB1 1013
-#define IDC_CHECK1 1014
-#define IDC_CHECK2 1015
-#define IDC_CHECK3 1016
-#define IDC_CHECK4 1017
-#define IDC_CHECK5 1018
-#define IDC_CHECK6 1019
-#define IDC_CHECK7 1020
-#define IDC_CHECK8 1021
#define IDC_COMBO1 1022
#define IDC_SSLKEYCHOOSER 1023
#define IDC_SSLCERTCHOOSER 1025
@@ -90,16 +74,15 @@
#define IDC_CHECK_read_options_from_mycnf 10026
#define IDC_CHECK_disable_transactions 10027
#define IDC_CHECK_force_use_of_forward_only_cursors 10028
-#define IDC_CHECK_trace_drivers_calls 10029
#define IDC_CHECK_allow_multiple_statements 10029
-#define IDC_CHECK_save_queries 10030
-#define IDC_CHECK_force_use_of_forward_only_cursors3 10030
#define IDC_CHECK_limit_column_size 10030
#define IDC_EDIT_sslca 10031
#define IDC_EDIT_sslcapath 10032
#define IDC_EDIT_sslcert 10033
#define IDC_EDIT_sslkey 10034
#define IDC_EDIT_sslcipher 10035
+#define IDC_CHECK_handle_binary_as_char 10036
+#define IDC_CHECK_save_queries 10037
#define IDC_BUTTON_TEST 11014
#define IDC_BUTTON_HELP 11015
#define IDC_STATIC -1
Modified: branches/guffert/util/installer.h
===================================================================
--- branches/guffert/util/installer.h 2008-07-30 16:33:26 UTC (rev 1133)
+++ branches/guffert/util/installer.h 2008-08-04 06:39:09 UTC (rev 1134)
@@ -110,6 +110,7 @@
BOOL safe;
BOOL enable_auto_reconnect;
BOOL enable_auto_increment_null_search;
+ BOOL handle_binary_as_char;
/* flags 2 */
BOOL dont_prompt_upon_connect;
BOOL enable_dynamic_cursor;
| Thread |
|---|
| • Connector/ODBC 3.51 commit: r1134 - in branches/guffert: . setupgui setupgui/windows util | bdegtyariov | 4 Aug |
