bzr commit into mysql-5.1-bugteam branch (svoj:3418)

[Sergey Vojtovich]

#At file:///home/svoj/devel/innodb-snapshots/mysql-5.1-bugteam/ based on revid:svoj@stripped

 3418 Sergey Vojtovich	2010-03-24
      Applying InnoDB snapshot
      
      Detailed revision comments:
      
      r6822 | vasil | 2010-03-15 10:17:31 +0200 (Mon, 15 Mar 2010) | 12 lines
      branches/5.1:
      
      Typecast to silence a compiler warning:
      
      row/row0sel.c: 4548
              C4244: '=' : conversion from 'float' to 'ib_ulonglong', possible loss of data
      row/row0sel.c: 4553
              C4244: '=' : conversion from 'double' to 'ib_ulonglong', possible loss of data
      
      Reported by:	Jonas Oreland <Jonas.Oreland@stripped>
      Discussed with:	Sunny Bains <sunny.bains@stripped>

    modified:
      storage/innobase/row/row0sel.c
=== modified file 'storage/innobase/row/row0sel.c'
--- a/storage/innobase/row/row0sel.c	2009-11-30 09:41:38 +0000
+++ b/storage/innobase/row/row0sel.c	2010-03-24 14:52:28 +0000
@@ -4545,12 +4545,12 @@ row_search_autoinc_read_column(
 
 	case DATA_FLOAT:
 		ut_a(len == sizeof(float));
-		value = mach_float_read(data);
+		value = (ib_ulonglong) mach_float_read(data);
 		break;
 
 	case DATA_DOUBLE:
 		ut_a(len == sizeof(double));
-		value = mach_double_read(data);
+		value = (ib_ulonglong) mach_double_read(data);
 		break;
 
 	default:


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