From 4e509cbf1b6702d45bfc7a0820f5134f3e4f2cf0 Mon Sep 17 00:00:00 2001
From: asfernandes <asfernandes@users.sourceforge.net>
Date: Thu, 30 Apr 2015 15:56:47 +0000
Subject: [PATCH] Fixed CORE-3234 - Support for text BLOBs >= 32K as first
 argument for TRIM().

---
 doc/WhatsNew           | 10 +++++-----
 src/dsql/ExprNodes.cpp |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/WhatsNew b/doc/WhatsNew
index 84ca15c55f..2a550e0d0f 100644
--- a/doc/WhatsNew
+++ b/doc/WhatsNew
@@ -296,6 +296,11 @@
       Contributor(s):
         Dmitry Yemanov <dimitr at firebirdsql.org>
 
+    * Improvement CORE-3234
+        Support for text BLOBs >= 32K as first argument for TRIM()
+      Contributor(s):
+        Adriano dos Santos Fernandes <adrianosf at gmail.com>
+
     * Improvement CORE-3226
         IPv6 support
       Contributor(s):
@@ -1845,11 +1850,6 @@
       Contributor(s):
         Alex Peshkov <peshkoff at mail.ru>
 
-    * Improvement CORE-3234
-        Support for text BLOBs >= 32K as first argument for TRIM()
-      Contributor(s):
-        Adriano dos Santos Fernandes <adrianosf at gmail.com>
-
     * Improvement CORE-3085
         Add clause ALTER DOMAIN <name> {DROP | SET} NOT NULL
       See also:
diff --git a/src/dsql/ExprNodes.cpp b/src/dsql/ExprNodes.cpp
index a326db0951..73450872c7 100644
--- a/src/dsql/ExprNodes.cpp
+++ b/src/dsql/ExprNodes.cpp
@@ -10307,7 +10307,7 @@ dsc* TrimNode::execute(thread_db* tdbb, jrd_req* request) const
 
 	const UCHAR* charactersAddress;
 	MoveBuffer charactersBuffer;
-	USHORT charactersLength;
+	ULONG charactersLength;
 
 	if (trimCharsDesc)
 	{