Commit 358e0883 authored by unknown's avatar unknown

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

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


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
parents 7b3b008b e5ad6196
...@@ -2424,8 +2424,7 @@ Backup::execDEFINE_BACKUP_REQ(Signal* signal) ...@@ -2424,8 +2424,7 @@ Backup::execDEFINE_BACKUP_REQ(Signal* signal)
}; };
const Uint32 maxInsert[] = { const Uint32 maxInsert[] = {
2048, // Temporarily to solve TR515 2048, // Temporarily to solve TR515
//25, // 100 bytes 4096, // 4k
2048, // 4k
16*3000, // Max 16 tuples 16*3000, // Max 16 tuples
}; };
Uint32 minWrite[] = { Uint32 minWrite[] = {
...@@ -3231,7 +3230,7 @@ Backup::execSTART_BACKUP_REQ(Signal* signal) ...@@ -3231,7 +3230,7 @@ Backup::execSTART_BACKUP_REQ(Signal* signal)
trigPtr.p->tab_ptr_i = tabPtr.i; trigPtr.p->tab_ptr_i = tabPtr.i;
trigPtr.p->logEntry = 0; trigPtr.p->logEntry = 0;
trigPtr.p->event = j; trigPtr.p->event = j;
trigPtr.p->maxRecordSize = 2048; trigPtr.p->maxRecordSize = 4096;
trigPtr.p->operation = trigPtr.p->operation =
&ptr.p->files.getPtr(ptr.p->logFilePtr)->operation; &ptr.p->files.getPtr(ptr.p->logFilePtr)->operation;
trigPtr.p->operation->noOfBytes = 0; trigPtr.p->operation->noOfBytes = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment