From: Jorgen Loland
Date: August 26 2010 1:55pm
Subject: bzr push into mysql-next-mr-bugfixing branch (jorgen.loland:3249 to 3250)
 Bug#30597
List-Archive: http://lists.mysql.com/commits/116897
X-Bug: 30597
Message-Id: <20100826135511.23D723FC@atum21.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0145247273753927107=="

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

 3250 Jorgen Loland	2010-08-26
      Post-push fix for BUG#30597: Need to explicitly cast int 
      argument to log10() to double on SPARC 
     @ sql/sql_select.cc
        Cast int argument to log10() to double

    modified:
      sql/sql_select.cc
 3249 Alexander Barkov	2010-08-26 [merge]
      Merging from mysql-trunk-bugfixing

    modified:
      mysql-test/r/ctype_utf32.result
      mysql-test/suite/sys_vars/t/secure_file_priv.test
      mysql-test/t/ctype_utf32.test
      storage/myisam/mi_key.c
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-08-26 12:02:59 +0000
+++ b/sql/sql_select.cc	2010-08-26 13:54:59 +0000
@@ -22052,7 +22052,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(last_select->select_number)+1;
+      int last_length= log10((double)last_select->select_number)+1;
 
       SELECT_LEX *sl= join->unit->first_select();
       uint len= 6, lastop= 0;


--===============0145247273753927107==
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\
#   xobppp06n1c1sg5i
# target_branch: file:///export/home/jl208045/mysql/mysql-next-mr-\
#   bugfixing-30597/
# testament_sha1: 76be49b5335678bd3ef4cdf4d6d98b6b946636fa
# timestamp: 2010-08-26 15:55:11 +0200
# base_revision_id: bar@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa6IeMAAAaFfgFAQWGv//3qV
WgC////wUAPjm9Dzeu7uk9cbwyRDIptTzVPTCZBoE2oNBowT1A0DKCaaniNJkelPUbU2TSAGgAAA
MiNCmaaTQjEaaDRoNANNAaADakTKPUT1NPUfqajNJo8o9QAGgBoAJJTKaZDCaNE9BlPU0xGhoAA0
Gm16ezEnHcNr9k4Eq4YwBULFWVqU/8oFwzediIg5Slr0GVSJKtFet7c6N6UC5K+HTnB1NNzRNDGo
iwMYNmSiiZKIypCNrx1V5lCSWTEcBvBHO/sbABYuFH61VUfBaC5HyGtGCSSqaT5wgjSk1w5CzAsY
492eyVzjiVOtHURwoUM6Y08iUBqMSjRdwmQkxbYYBF+w41TVldDlUzrhG1ExzUJBkVSOl+2sX7td
txQN0OEF+FtajsBxweIv0KdUhyXhFxq9CoeFy+ROqKpHyb8EafpI1SxAIBwfSb6AqVDJpxUht6XT
A3mLIpDCIF04+z9JGf7KF5kg3BIhRdBNpVAFgtSahoC9gNJlYzLJ4IugLRHF1apBAUwpfoqBSs12
HXkqQnORsowLnGiEUlz9D2GFzp9Q33QsaCLQ0ym0jeSyGayitDQ0rhWQkEOW4icvFoqshWtFlNxl
KDq4CSPSBqrD5wSKBXBQ+LiywRQz5ARikewYsPM+zluK4/Ho0aDAAe8bECIlnp8Z2+VY4QfDrIcO
KBDGymCxDGZwaTPxrrU1p2VASxHRMPDY6VbiBB2mIiufWBvYLRAlSw7Ww2jWubYcbG95qNwapITq
W4UO3GE4bhZCusarEyq/l1odLeyuK7CBmAMJFXaaCWIEasYjYFv1IaZuBppXYwpAG0ZZ8Q8y70lv
YKEHLQcOR/G1YaGnTxNUly1CQEbg4mbDHf+3PxWpuXnNM7Ik08lZSXECTCO4aihlxVUw45IS0Chz
C841y4RpTXVatAbCYn+tepqCqPEOTyN1qyCnUosiDbPdcHMmpzHMpbwGiRLv4uE5aooHRi2SPoAj
GWjOZiFimYCNt7w+7sk7KAMAFOlR6w9MzeOARUUNyRaDQBpPEGwJAkgX29GpBT851Pe2jTANAxeS
kl15deBd4GGydI5lDExMSFOa7suwkXLB+KOiIYBu4TE8ZcBgHYXkXdGK8gQBmMugeZNsTVcaJTP1
klnSKpJdkVHjAvh/cQHrQ9cMlieLDQEuZmBxDbvVMSVdorss3XMkRrz5pIVLgDeUi9yWhiA8Q4HG
vZifOJjEDKcxjaGkDrprBwrhRs4CXhkS46tSRl5gK5xfYMAwIFgRJyXwhuTK5xGxme9GCTWzGNEt
POtMlBuSImBQKDFCVeAy6LY0qVjnkxi8rSxngUrMigU9o1FqUdLRO8yP+LuSKcKEhXRDxgA=


--===============0145247273753927107==--