--- parser3/src/classes/string.C 2009/06/06 05:28:22 1.181 +++ parser3/src/classes/string.C 2009/07/06 08:49:49 1.183 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_STRING_C="$Date: 2009/06/06 05:28:22 $"; +static const char * const IDENT_STRING_C="$Date: 2009/07/06 08:49:49 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -562,8 +562,8 @@ const String* sql_result_string(Request& Temp_lang temp_lang(r, String::L_SQL); const String& statement_string=r.process_to_string(statement); - const char* statement_cstr= - statement_string.cstr(String::L_UNSPECIFIED, r.connection()); + const char* statement_cstr=statement_string.cstr(String::L_UNSPECIFIED, r.connection()); + String_sql_event_handlers handlers(statement_string, statement_cstr); r.connection()->query( @@ -668,7 +668,7 @@ static void _trim(Request& r, MethodPara } } - r.write_assign_lang(src.trim(kind, chars)); + r.write_assign_lang(src.trim(kind, chars, &r.charsets.source())); } static void _append(Request& r, MethodParams& params) {