From: Jorgen Loland
Date: September 2 2010 2:20pm
Subject: bzr commit into mysql-next-mr-bugfixing branch (jorgen.loland:3235)
List-Archive: http://lists.mysql.com/commits/117425
Message-Id: <20100902142009.5118C20ED@atum21.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1231626257315839708=="

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

#At file:///export/home/jl208045/mysql/mysql-next-mr-opt-backporting-49129/ based on revid:jorgen.loland@stripped

 3235 Jorgen Loland	2010-09-02
      Cast return of log10(double) to int to avoid warning

    modified:
      sql/sql_select.cc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-09-02 07:34:10 +0000
+++ b/sql/sql_select.cc	2010-09-02 14:20:05 +0000
@@ -22167,7 +22167,7 @@ void select_describe(JOIN *join, bool ne
     {
       SELECT_LEX *last_select= join->unit->first_select()->last_select();
       // # characters needed to print select_number of last select
-      int last_length= log10((double)last_select->select_number)+1;
+      int last_length= (int)log10((double)last_select->select_number)+1;
 
       SELECT_LEX *sl= join->unit->first_select();
       uint len= 6, lastop= 0;


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jorgen.loland@stripped\
#   fgs50vx5edrv7eu2
# target_branch: file:///export/home/jl208045/mysql/mysql-next-mr-opt-\
#   backporting-49129/
# testament_sha1: e92bcaf9970d28d599d8be8bcbada65a3cc8669c
# timestamp: 2010-09-02 16:20:09 +0200
# base_revision_id: jorgen.loland@stripped\
#   mgm68fppqfsvn5ju
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYQoXrwAAXrfgBAQUGv//1oU
AAC////wUAOHc097Oe7S96ihKIiMJgQzRJ+pqaepptE00GmhoJSFMmjaMRqR4ow1PUybUGAQBJIB
ATTJkTNKNP1QekaB6mgAyVPSeJGnqPUeiBoA0ANNAGElIofgpmVP1R7VHqBvVNAGgAPUMmdYvSny
WwrCZkoGm3M2yBls6MvkqxcqqdOSdYMyhKxWcM2nL2/oYI/WaLqyBQW3PY6qqi3RpRioNH2F2qla
KNBUCKqbIeKAZVOARfeTFNAMjabpItEh6NVCI5kRBqkzjWAoCGSKxybARN48UHMH3tICNigSXGDq
yQrFNlrmVBQF5McuJnr5ufLKfGPDffkuArCGo+poU43w8SU4yxw1+jRbq+w1UtEglEFhEJ0rS62D
6txhzcGldzPoYWk3QzrjMOnwdvKe+t2pqa5zLVesaA4TauKiR0g4gqcK3mJzzPzolI/QpaS8I24+
oMM8jhqPu0FfsCRDMkRYb060n2BWj3IYPIcpRoozFeyt+Lgl3FN96QgloVa1n4JEc6MX1sJVEBbZ
bnzLSpEcCAikRxpEoW8bqDNNOaWlm9pMjcxdN6abRKBOjR8zLPyhd04J3H7dNopESxhj08XtdXbB
CmE7HIpi0KtXfLbwRCV+hoYzzNnBJ5EO/aAtSvc0fgUczdva+TI2PDekUg4Y0YckeMhlI3XWqoJE
iCTqIyFova6eLXeW5pYUUUJFFycSikWwWcshJmg+wstn34XUNV6LnmDbORNUiDK/AR81L1SfWkca
yyh7VTc2HghMCU7zmipwwudFtfsIrxFCvOkD7wpVStTE5mTEtPMpHXCdsN80Fm6gOILyQHm1BmgE
iEERl/rgWLuBvwVJIlDTPTH9RUuo2D0YaHg1mfvJiWwy1BKGtRmMIe58CsiyBxHtNYNwHl4TBMwG
pcCU+cx3cQSLhyI68tr4eiRjgI8QZZNfXAsGVnbGzKpupvhNyQ2oMbqEgZIfR6k6dzeBFRQzLLkX
rGxN2FCWlyRxAnhtaT/UiIafyRitZuLLoN/FY8mZPI+vudq+toOCdKdoBYhuvSbKSS2gi+rZxEFL
q5WXU75SupQyEy8Rak98qB3wXN/UGmrMDt2af4c4sxTWI5A+l7G7F37eovi9oDNfobcO9Wm140yA
agvYqzSYZuK2Dga+cryImLqNQRGhL2FL0OwphWtjamRG0zP+LuSKcKEhCFC9eA==


--===============1231626257315839708==--