Commit 51ef8d8d authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/50-work 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  merge
parents 64b1745f e5ad6196

storage/ndb/src/kernel/blocks/backup/Backup.cpp

+2 −3
Original line number Diff line number Diff line
@@ -1298,7 +1298,7 @@ Backup::sendCreateTrig(Signal* signal, 
    trigPtr.p->tab_ptr_i = tabPtr.i;

    trigPtr.p->logEntry = 0;

    trigPtr.p->event = j;

    trigPtr.p->maxRecordSize = 2048;

    trigPtr.p->maxRecordSize = 4096;

    trigPtr.p->operation =

      &ptr.p->files.getPtr(ptr.p->logFilePtr)->operation;

    trigPtr.p->operation->noOfBytes = 0;
@@ -2294,8 +2294,7 @@ Backup::execDEFINE_BACKUP_REQ(Signal* signal) 
  };

  const Uint32 maxInsert[] = {

    2048,  // Temporarily to solve TR515

    //25,      // 100 bytes

    2048,    // 4k

    4096,    // 4k

    16*3000, // Max 16 tuples

  };

  Uint32 minWrite[] = {