Merge

sql/ha_ndbcluster.cc: SCCS merged

Merge
sql/ha_ndbcluster.cc: SCCS merged
3f23eeb7 · unknown · c1251816 · 41535c9b · 3f23eeb7
Commit 3f23eeb7 authored Feb 07, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

sql/ha_ndbcluster.cc sql/ha_ndbcluster.cc +2 -3

No files found.
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -3681,11 +3681,10 @@ static void ndb_set_fragmentation(NDBTAB &tab, TABLE *form, uint pk_length)
    ulonglong acc_fragment_size= 512*1024*1024;
    ulonglong max_rows= form->s->max_rows;
 #if MYSQL_VERSION_ID >= 50100
+    no_fragments= (max_rows*acc_row_size)/acc_fragment_size+1;
+#else
    no_fragments= ((max_rows*acc_row_size)/acc_fragment_size+1
 		   +1/*correct rounding*/)/2;
-#else
->>>>>>>
-    no_fragments= (max_rows*acc_row_size)/acc_fragment_size+1;
 #endif
  }
  {