mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
joreland@mysql.com 2005-01-03 09:24:18 +01:00
parent 9dac644fc9
commit bafb41ae12
3 changed files with 5 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ndb/test/ndbapi/testBitfield.cpp
View file

@ -54,6 +54,9 @@ main(int argc, char** argv){
load_defaults("my",load_default_groups,&argc,&argv); load_defaults("my",load_default_groups,&argc,&argv);
int ho_error; int ho_error;
argc--;
argv++;
Ndb_cluster_connection con(opt_connect_str); Ndb_cluster_connection con(opt_connect_str);
if(con.connect(12, 5, 1)) if(con.connect(12, 5, 1))
{ {

21
ndb/test/ndbapi/testNdbApi.cpp
View file

@ -131,7 +131,7 @@ int runTestMaxTransaction(NDBT_Context* ctx, NDBT_Step* step){
NdbConnection* pCon; NdbConnection* pCon;
int type = i%4; int type = i%2;
switch (type){ switch (type){
case 0: case 0:
pCon = pNdb->startTransaction(); pCon = pNdb->startTransaction();
@ -141,25 +141,6 @@ int runTestMaxTransaction(NDBT_Context* ctx, NDBT_Step* step){
"DATA", "DATA",
4); 4);
break; break;
case 2:
ndbout_c("startTransactionDGroup not supported");
abort();
/*
pCon = pNdb->startTransactionDGroup(1,
"TEST",
0);
*/
break;
case 3:
ndbout_c("startTransactionDGroup not supported");
abort();
/*
pCon = pNdb->startTransactionDGroup(2,
"TEST",
1);
*/
break;
default: default:
abort(); abort();
} }

66
ndb/test/run-test/daily-basic-tests.txt
View file

@ -458,71 +458,7 @@ args:
max-time: 1500 max-time: 1500
cmd: testTransactions cmd: testTransactions
args: T1 args:
max-time: 1500
cmd: testTransactions
args: T2
max-time: 1500
cmd: testTransactions
args: T3
max-time: 1500
cmd: testTransactions
args: T4
max-time: 1500
cmd: testTransactions
args: T5
max-time: 1500
cmd: testTransactions
args: T6
max-time: 1500
cmd: testTransactions
args: T7
max-time: 1500
cmd: testTransactions
args: T8
max-time: 1500
cmd: testTransactions
args: T9
max-time: 1500
cmd: testTransactions
args: T10
max-time: 1500
cmd: testTransactions
args: T11
max-time: 1500
cmd: testTransactions
args: T12
max-time: 1500
cmd: testTransactions
args: T13
max-time: 1500
cmd: testTransactions
args: T14
max-time: 1500
cmd: testTransactions
args: I1
max-time: 1500
cmd: testTransactions
args: I2
max-time: 1500
cmd: testTransactions
args: I3
max-time: 1500 max-time: 1500
cmd: testRestartGci cmd: testRestartGci