From: Ole John Aske Date: February 28 2011 11:38am Subject: bzr commit into mysql-5.1-telco-7.0 branch (ole.john.aske:4235) List-Archive: http://lists.mysql.com/commits/132101 Message-Id: <20110228113823.784B9223@fimafeng09.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4960589741453184813==" --===============4960589741453184813== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0/ based on revid:ole.john.aske@stripped 4235 Ole John Aske 2011-02-28 Fixed compiler warnings introduced by last push. modified: sql/ha_ndbcluster.cc === modified file 'sql/ha_ndbcluster.cc' --- a/sql/ha_ndbcluster.cc 2011-02-28 10:42:04 +0000 +++ b/sql/ha_ndbcluster.cc 2011-02-28 11:38:19 +0000 @@ -11256,7 +11256,7 @@ ha_ndbcluster::records_in_range(uint inx if (eq_fraction >= 1.0) // Exact match -> 1 row DBUG_RETURN(1); - rows = (Uint64)(table_rows / pow(table_rows, eq_fraction)); + rows = (Uint64)((double)table_rows / pow(table_rows, eq_fraction)); if (rows > (table_rows/50)) // EQ-range: Max 2% of rows rows= (table_rows/50); --===============4960589741453184813== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/ole.john.aske@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@stripped\ # 4u8kpcbm1mqjwtmq # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0/ # testament_sha1: 259dd4c1ff77462f3660a0a962804f37045b3cc1 # timestamp: 2011-02-28 12:38:23 +0100 # base_revision_id: ole.john.aske@stripped\ # x8cfyiihnfry3vd2 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYAwXnwAAYDfgAQQUGf//3MQ ggC////wUAOUteRuacu7257hJJE0wFPU9Mp5MSbTRTxMUPKaeU09QJJJkJmQymapiEaHqANBhA9B JKaZqnlT0h+qB6QZPU0bUD1AAAJKKBoDTTTTQNDQNqGgBoASiptDRkj0BTyno01D0gAADTO04Vb8 +BPfXenZayAshrZF7q5J3LDyp8cGZjw+6833MdtLPOe6Rwu6F7u3l+B0/htk7genmoo9LstA5hX+ 2Lf3C+2Cyuc8CPFImx+SKzvsL8NdAbLdM8iRgtCRKyRYPyvcr4CizsV2HtNHCLYDCMzcPB5YPBxl c8Hp7ddBNz9lojmDQcOExE1EWUZOsz3vuxFD2W2UPqlukCk+MRb/fC8j5zlqx2mB6xdNhu8FMJ9T oCK66JS8UQlHssUGMBpjihdz2mY4tmIPEnjcQo/jXS2mveD3qSuB4o2tTUKKFFUrDaUGTMoxU36E BZs2UKc/YFa3Hc4g0iW2ivLLx/Gll5jctUR6yQ0TrdSq5zt4FDYx2zzTyHcbtLJiKRFMjaWQHbEC mOEcZdhhf0CRdwFIywFK+eVHw6pPxzgzZkbdLsGtajVtaO9YRZEYJpNEcHdsci85K0bGq1d+yKRm Ymwx8u4Ptz2yTQI1LbyeHxwW1bqdZmXxnNu8FBHI8HGfO9PCjnySNtq3Y1Y6KCsr9ypZ99BmFdfq B5Rb8lBWLVZvlEcHDjkzJGCruSMc4UVJ8nxOgakpmavTb68yh0Zk/TDJUYxfB09hC4l3liWembLX GkctLbXTSgxujJebYa+fqxNp4TVNo6uPXiYpllofVtrstWF5EGZeg4itLBTX4aRG4nHfHCrtv1E3 GIMyLINEHx4suVQh6DfU4AlQQTBLbyialFjxGhOEEujLMwodxZ2YVSNqDkbA9/p/LekZCwHwUFoc xXEBeEAROClvN2VyRqSIEBujg8KOnEOJs6fimV0y1ykQfQLYK3dztGSGVL3hVPdAG92FTvdWDAwy ZZ0nA//RIuh4HDGyvIVhHCufUiMLac1X99KqnEEqsmN9jFuFEpfZSWEHhYil9kxhbRiT0ySuSKsG FqLtec8SHHqRKiL8WEE7eWihyGVAdza0ZHVDTY0bSaQb/UJESwyyaLrLnaVSoemr7DPNYfXaB6Ry 9Lzp3ju3TnC4UYbEI1TDaV1iT3jG5bE3eQOS8KCetU7xLghESISdTBYR8NlQjeG/xdyRThQkIAwX nwA= --===============4960589741453184813==--