bzr push into mysql-next-mr-bugfixing branch (jorgen.loland:3249 to 3250) Bug#30597

[Jorgen Loland]

 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;


Attachment: [text/bzr-bundle] bzr/[e-mail]