From: Ole John Aske Date: February 28 2011 1:46pm Subject: bzr commit into mysql-5.1-telco-7.0 branch (ole.john.aske:4236) List-Archive: http://lists.mysql.com/commits/132116 Message-Id: <20110228134613.55AAB223@fimafeng09.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4478306218677151506==" --===============4478306218677151506== 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 4236 Ole John Aske 2011-02-28 Yey another attempt to fix Windows compiler warnings modified: sql/ha_ndbcluster.cc === modified file 'sql/ha_ndbcluster.cc' --- a/sql/ha_ndbcluster.cc 2011-02-28 11:38:19 +0000 +++ b/sql/ha_ndbcluster.cc 2011-02-28 13:46:09 +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)((double)table_rows / pow(table_rows, eq_fraction)); + rows = (Uint64)((double)table_rows / pow((double)table_rows, eq_fraction)); if (rows > (table_rows/50)) // EQ-range: Max 2% of rows rows= (table_rows/50); --===============4478306218677151506== 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\ # ikd6grhuz4zr7hwb # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0/ # testament_sha1: 62b4899a3786237cc33659e5e2dcf3317eec2e02 # timestamp: 2011-02-28 14:46:13 +0100 # base_revision_id: ole.john.aske@stripped\ # 4u8kpcbm1mqjwtmq # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTLzfJQAAX9fgAQQUGf//3IQ gqC////wUAOU90XJtxneblwlEU0bKnqeTEeqeKfpMmiCHqNqZqPRiDJFPTRqn5GTU8qeiADQGEBk AJJEZNRppkDSaaMj01D1DQAADFKepk09TTTQaADQaNAAA0CSiZJsQU8TVPwiTyZTyj01ADIP1Qq/ KqeuqSMVIqfjxABdZrpmVW8q0u+ce9yIg9tp35moOapWsbwfKzp1+ZL5LeWfjTKuShpbCiuumObW jFQj1t2i3xtzwLJzmIc7wW7kOhIJ/9pGON3roueiEUqEQgNe26d4osbFbjmSrgOEUZlA8mETTGYw sZSOnE8IJzTt2ONdQn7sICOQ0u3yEUyWNwQjxoUqK32UCyTB6LwIH7lhe8oziHSRKNZe04B/snjW fIExIrgGcdoh7q4NDdkthnwHiuLdsyKKsiTzUs8rmuoYWWkla0aeFxPMaGYF3i4tJDsDX3FoZCZb VDbt8Q3aC22Q9xQSK86sHimdIzbN5qbZkyxWVEzFu+OKAtC76aT2rxfcKZ6iMDWWAcunKD0Cx7xO kLgQ4BoS/ILjSL5OhoAtDAFgulYIQyU61MBGDM7wFNwhBLLlCZkRemg05EIxa/vNZy6cTX1Lb23T pFDEmGPVz8+DnXY8kEcFwweTDg27i0etl8DR0dIKnHJqZg6qpPsogjz7JGKfycjmeXDAmVyf0KR4 Z7wappznp7GcjQmBMtjCvG9EJHcdVpIlVmHZPkdUPPiCwqaw1WbsmMrNpJo9X0ogmBlYKdKiKZYu RDZSuTJnApuxgWUT24UqT69k9a0+zCo3nZFTCvVIm6xlN8bh4SJqOjTNAoqgYHAbHNAunKOW7wMY sN/XxGaUJphNGO0uDh7Do8TqC3iyFenrRxVC5MfxGitWLjDoGtMde2698MA4HUOVjuvdI6hvOQng tmIdwzNhoE4RajWHckkc6Q8eNdn4yioiIg1KjpkV5oXQgPjVqDAJ8Uz4RIRywNAkKahK6nIOFKF5 AJFGKvZjeo/EiMDsJwmZqhBcRygFBIrAQnYwzXJw18MTRHKXC/EkewPI4tlPxm2Mji0IDAkdCD9G JXiqSLmBxeinKg/JeI/D6HpU/nbn0r1V0uQqf4JSXXn76SVXXAvadEHJflkruMxsSZB1er3FasD6 K2d1DUW0/Vnw9m+c8/EKIhWE7FRnxL7gpMnQsW7zFJYhUQreJodgraQFBai95WKyI+wX+LuSKcKE gZeb5KA= --===============4478306218677151506==--