=== modified file 'ChangeLog' --- ChangeLog 2009-11-13 12:00:55 +0000 +++ ChangeLog 2009-11-13 17:16:09 +0000 @@ -1,5 +1,12 @@ 5.1.7 + Functionality added or changed: + + Bugs fixed: + * Charset introducer for binary data is _ (Bug #48698) + +---- + 5.1.6 (09-Nov-2009) Functionality added or changed: === modified file 'driver/execute.c' --- driver/execute.c 2009-10-07 20:43:23 +0000 +++ driver/execute.c 2009-11-13 16:54:47 +0000 @@ -508,13 +508,23 @@ to= add_to_buffer(net, to, data, length); goto out; } - /* else treat as a string */ + /* else _binary introducer for binary data */ + case SQL_BINARY: + case SQL_VARBINARY: + case SQL_LONGVARBINARY: + { + if (dbc->cxn_charset_info->number != + dbc->ansi_charset_info->number) + { + to= add_to_buffer(net, to, "_binary", 7); + } + /* We have only added the introducer, data is added below. */ + break; + } + /* else treat as a string */ case SQL_CHAR: case SQL_VARCHAR: case SQL_LONGVARCHAR: - case SQL_BINARY: - case SQL_VARBINARY: - case SQL_LONGVARBINARY: case SQL_WCHAR: case SQL_WVARCHAR: case SQL_WLONGVARCHAR: