bk commit into 5.0 tree (pekka:1.2246)

[pekka]

Below is the list of changes that have just been committed into a local
5.0 repository of pekka. When pekka does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-22 14:26:56+02:00, pekka@stripped +1 -0
  ndb - post-merge fix 5.0 to 5.0-ndb: number of frags if --without-big-tables

  sql/ha_ndbcluster.cc@stripped, 2006-08-22 14:24:01+02:00, pekka@stripped +7 -2
    calculate frags with (ulonglong)max_rows in case --without-big-tables

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/export/home/space/pekka/ndb/version/my50-ndb

--- 1.275/sql/ha_ndbcluster.cc	2006-08-22 14:27:12 +02:00
+++ 1.276/sql/ha_ndbcluster.cc	2006-08-22 14:27:12 +02:00
@@ -4175,10 +4175,15 @@
       acc_row_size+= 4 + /*safety margin*/ 4;
 #endif
     ulonglong acc_fragment_size= 512*1024*1024;
+    /*
+     * if not --with-big-tables then max_rows is ulong
+     * the warning in this case is misleading though
+     */
+    ulonglong big_max_rows = (ulonglong)max_rows;
 #if MYSQL_VERSION_ID >= 50100
-    no_fragments= (max_rows*acc_row_size)/acc_fragment_size+1;
+    no_fragments= (big_max_rows*acc_row_size)/acc_fragment_size+1;
 #else
-    no_fragments= ((max_rows*acc_row_size)/acc_fragment_size+1
+    no_fragments= ((big_max_rows*acc_row_size)/acc_fragment_size+1
                    +1/*correct rounding*/)/2;
 #endif
   }