1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
tomas@poseidon.ndb.mysql.com 2005-02-07 08:54:35 +01:00
commit 0da4ee9131
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sql/ha_ndbcluster.cc
View File

@ -3669,18 +3669,24 @@ static void ndb_set_fragmentation(NDBTAB &tab, TABLE *form, uint pk_length)
uint no_fragments; uint no_fragments;
{ {
#if MYSQL_VERSION_ID >= 50000 #if MYSQL_VERSION_ID >= 50000
uint acc_row_size= 25+2; uint acc_row_size= 25 + /*safety margin*/ 2;
#else #else
uint acc_row_size= pk_length*4; uint acc_row_size= pk_length*4;
/* add acc overhead */ /* add acc overhead */
if (pk_length <= 8) if (pk_length <= 8) /* main page will set the limit */
acc_row_size+= 25+2; /* main page will set the limit */ acc_row_size+= 25 + /*safety margin*/ 2;
else else /* overflow page will set the limit */
acc_row_size+= 4+4; /* overflow page will set the limit */ acc_row_size+= 4 + /*safety margin*/ 4;
#endif #endif
ulonglong acc_fragment_size= 512*1024*1024; ulonglong acc_fragment_size= 512*1024*1024;
ulonglong max_rows= form->s->max_rows; ulonglong max_rows= form->s->max_rows;
#if MYSQL_VERSION_ID >= 50100
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; no_fragments= (max_rows*acc_row_size)/acc_fragment_size+1;
#endif
} }
{ {
uint no_nodes= g_ndb_cluster_connection->no_db_nodes(); uint no_nodes= g_ndb_cluster_connection->no_db_nodes();