dsql.cpp (Firebird-3.0.2.32703-0.tar.bz2) | : | dsql.cpp (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 1625 | skipping to change at line 1625 | |||
{ | { | |||
// character set name is not defined | // character set name is not defined | |||
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-504) << | ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-504) << | |||
Arg::Gds(isc_charset_not_found) << char set); | Arg::Gds(isc_charset_not_found) << char set); | |||
} | } | |||
id = resolved->intlsym_charset_id; | id = resolved->intlsym_charset_id; | |||
} | } | |||
string utf; | string utf; | |||
return DataTypeUtil::convertToUTF8(s, utf, id) ? utf : s; | return DataTypeUtil::convertToUTF8(s, utf, id, ERRD_post) ? utf : s; | |||
} | } | |||
/** | /** | |||
sql_info | sql_info | |||
@brief Return DSQL information buffer. | @brief Return DSQL information buffer. | |||
@param request | @param request | |||
@param item_length | @param item_length | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |