mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 11:27:39 +02:00
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077 ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged
This commit is contained in:
commit
e0ec1f1609
2 changed files with 5 additions and 0 deletions
|
|
@ -3084,6 +3084,7 @@ void Dblqh::execATTRINFO(Signal* signal)
|
||||||
return;
|
return;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
ndbout_c("%d", regTcPtr->transactionState);
|
||||||
ndbrequire(false);
|
ndbrequire(false);
|
||||||
break;
|
break;
|
||||||
}//switch
|
}//switch
|
||||||
|
|
|
||||||
|
|
@ -222,6 +222,10 @@ max-time: 500
|
||||||
cmd: testScan
|
cmd: testScan
|
||||||
args: -n ScanRead488 -l 10 T6
|
args: -n ScanRead488 -l 10 T6
|
||||||
|
|
||||||
|
max-time: 500
|
||||||
|
cmd: testScan
|
||||||
|
args: -n ScanRead488Timeout -l 10 T6
|
||||||
|
|
||||||
max-time: 600
|
max-time: 600
|
||||||
cmd: testScan
|
cmd: testScan
|
||||||
args: -n ScanRead40 -l 100 T2
|
args: -n ScanRead40 -l 100 T2
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue