From: Tor Didriksen
Date: December 17 2010 10:06am
Subject: bzr commit into mysql-trunk-bugfixing branch (tor.didriksen:3444)
List-Archive: http://lists.mysql.com/commits/127155
Message-Id: <20101217100634.CCDD333E6@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3703114261523263227=="

--===============3703114261523263227==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/didrik/repo/trunk-bugfixing-filesort/ based on revid:tor.didriksen@stripped

 3444 Tor Didriksen	2010-12-17
      fix compile warnings

    modified:
      sql/filesort.cc
=== modified file 'sql/filesort.cc'
--- a/sql/filesort.cc	2010-12-17 09:41:21 +0000
+++ b/sql/filesort.cc	2010-12-17 10:06:29 +0000
@@ -1154,13 +1154,13 @@ bool check_if_pq_applicable(Sort_param *
   if (param->max_rows == HA_POS_ERROR)
   {
     DBUG_PRINT("info", ("No LIMIT"));
-    DBUG_RETURN(NULL);
+    DBUG_RETURN(false);
   }
 
   if (param->max_rows + 2 >= UINT_MAX)
   {
     DBUG_PRINT("info", ("Too large LIMIT"));
-    DBUG_RETURN(NULL);
+    DBUG_RETURN(false);
   }
 
   ulong num_available_keys=


--===============3703114261523263227==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   nj9c5bfbmi023ypb
# target_branch: file:///export/home/didrik/repo/trunk-bugfixing-\
#   filesort/
# testament_sha1: 37f108df752953897ad20ded0fc40a748dc09c7f
# timestamp: 2010-12-17 11:06:34 +0100
# base_revision_id: tor.didriksen@stripped\
#   91wti8ntb9nrmcez
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbR3NkwAAXjfgEAQUGP//1aB
FgC////wUANnhnrz3vbU92oEogknqeU3ko2mpo8pjKeiaNPRNNBgJSmKfqjYVN5KbU8p+o1AAABp
oGEqaU9MptQyAAaA0GgAHqAJJTRoJsSg9T0nqNlDT1A0AAASSIMhNGp5MBFDT01D1PU0epo9QYwx
1Ui7/UWh8QWfLMgeGR7GtYynuEYdkL6VVU37Q/HSKSrCdrHNdi48tv1zwhIqD5ssYz1Z7kYqGwy2
zEpxEP1eFvY/OGfE9GFllc+VVpGSRZdRGWRKttRwuPCoxESIXpmJsB5i0ZxQcGpQFEycTXlA6SpK
YOERSgvox10MbIoc/xKwnEQalraa1UfujajOIjpn0JSLFJjRaxQGyAiacHsIrF7rJ5qLrsRRu3OC
ZF1hxMdjzGRRg15x2llFvqZrlupNb8RNxGVmeiathgGwcRz3WNJkXixo7hxkO1/miGQQYa4UMMBG
svUsYirJXsTPhBVo1wsTOGGpEWuNOBzLeVlitomXE4RiUMEmyCxUUqGNpITgzVBshNF8BhqS5cBI
XYCpXA1dQHvW6RIpFjFqRqMHA1yOUMoKC/O+UuE6Y+WdilERGgh1O3MqxeD0IQFjTbMQIFqPGof+
5x43VjgsNWZy6DU3puwRC6EGhsmKKHe0qHTQmD0Um/yLOR8qgcXwxFuFp05I6qcrc2AnnmqftttB
+GvBmSLCtIjo7VHHdlhkWwVKaZXRKC4kkYD0J6GGBAUEbmOFkziIs8mSxjJZQuYUveV1Y2naVztV
2hhlCxse7i02AuR6plz21y553haQCZWA+4vORCpZORSJEed98CPPTbw1pfpyFufEPGXoa40DtFJY
ENoabBMYsGpGzzXbYkPmcTAq72FIeHINn+q4ZWS+AfELah/jEW9mluDUF3wCAQcEhOkMMMFY1YL3
iECQzBE0i9pSBU6BHv0kMn2jYvVqWIg3G+cHMtT2FLPcE9ZoDKlkyheSfehUB1uPLNI9Uhgioh8H
qymRW3My/opCXV0LnTZHGia8gRxZIvTJLFyLNkh+W0FUoIqjvvi8KmgUTJpT5l20Fu4sU6A0VuUQ
592g8gizw1TneRucDpKd5Z0hb2CekW02jO51hWD5nK3V5bpxfDGC3hoXdQqJFBcxXMPUjM3sLuSK
cKEhaO5smA==


--===============3703114261523263227==--