[Firebird-checkins] SF.net SVN: firebird:[57620] firebird/trunk/src/dsql/dsql.cpp

[<di...@us...>]

Revision: 57620
          http://sourceforge.net/p/firebird/code/57620
Author:   dimitr
Date:     2013-01-24 16:52:13 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
Slightly improved the condition for the Adriano's backward compatibility workaround, this optimizes METD_move() into a plain memcpy() for strings with an explicitly declared charset.

Modified Paths:
--------------
    firebird/trunk/src/dsql/dsql.cpp

Modified: firebird/trunk/src/dsql/dsql.cpp
===================================================================
--- firebird/trunk/src/dsql/dsql.cpp	2013-01-24 16:47:03 UTC (rev 57619)
+++ firebird/trunk/src/dsql/dsql.cpp	2013-01-24 16:52:13 UTC (rev 57620)
@@ -281,7 +281,7 @@
 		return 100;
 	}
 
-	map_in_out(this, true, message, 0, blr, msgLength, msgBuffer);
+	map_in_out(this, true, message, 0, NULL, msgLength, msgBuffer);
 
 	trace.fetch(false, res_successful);
 	return FB_SUCCESS;
@@ -859,7 +859,7 @@
 		JRD_receive(tdbb, req_request, message->msg_number, message->msg_length, msgBuffer);
 
 		if (outMsgLength)
-			map_in_out(this, true, message, 0, outBlr, outMsgLength, outMsg);
+			map_in_out(this, true, message, 0, NULL, outMsgLength, outMsg);
 
 		// if this is a singleton select, make sure there's in fact one record
 
@@ -1484,7 +1484,7 @@
 		// blr_text/blr_varying (i.e. with the connection charset). I'm reseting the charset
 		// here at the server as a way to make older (and not yet changed) client work
 		// correctly.
-		if (desc.isText())
+		if (desc.isText() && desc.getTextType() == ttype_dynamic)
 			desc.setTextType(ttype_none);
 
 		request->req_user_descs.put(parameter, desc);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.