database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

minor fixes

Browse Source 
mysql-test/r/ndb_blob.result:
  fixed result for ndb_blob.test
ndb/src/ndbapi/Ndb.cpp:
  added some debug calls
This commit is contained in:
unknown
2004-08-24 23:31:47 +00:00
parent 8bb0aaa516
commit c6216b12f3
2 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mysql-test/r/ndb_blob.result
View File

@ -270,6 +270,41 @@ a b c d a b c
2 2xb2 222 2xdd2 2 2 2 2 2xb2 222 2xdd2 2 2 2
drop table t2; drop table t2;
use test; use test;
select * from t1 order by a;
a b c d
1 1xb1 111 1xdd1
2 2xb2 222 2xdd2
3 3xb3 333 3xdd3
4 4xb4 444 4xdd4
5 5xb5 555 5xdd5
6 6xb6 666 6xdd6
7 7xb7 777 7xdd7
8 8xb8 888 8xdd8
9 9xb9 999 9xdd9
alter table t1 add x int;
select * from t1 order by a;
a b c d x
1 1xb1 111 1xdd1 NULL
2 2xb2 222 2xdd2 NULL
3 3xb3 333 3xdd3 NULL
4 4xb4 444 4xdd4 NULL
5 5xb5 555 5xdd5 NULL
6 6xb6 666 6xdd6 NULL
7 7xb7 777 7xdd7 NULL
8 8xb8 888 8xdd8 NULL
9 9xb9 999 9xdd9 NULL
alter table t1 drop x;
select * from t1 order by a;
a b c d
1 1xb1 111 1xdd1
2 2xb2 222 2xdd2
3 3xb3 333 3xdd3
4 4xb4 444 4xdd4
5 5xb5 555 5xdd5
6 6xb6 666 6xdd6
7 7xb7 777 7xdd7
8 8xb8 888 8xdd8
9 9xb9 999 9xdd9
delete from t1 where c >= 100; delete from t1 where c >= 100;
commit; commit;
select count(*) from t1; select count(*) from t1;

8
ndb/src/ndbapi/Ndb.cpp
View File

@ -407,11 +407,14 @@ Ndb::startTransactionLocal(Uint32 aPriority, Uint32 nodeId)
} }
#endif #endif
DBUG_ENTER("Ndb::startTransactionLocal");
DBUG_PRINT("enter", ("nodeid: %d", nodeId));
NdbConnection* tConnection; NdbConnection* tConnection;
Uint64 tFirstTransId = theFirstTransId; Uint64 tFirstTransId = theFirstTransId;
tConnection = doConnect(nodeId); tConnection = doConnect(nodeId);
if (tConnection == NULL) { if (tConnection == NULL) {
return NULL; DBUG_RETURN(NULL);
}//if }//if
NdbConnection* tConNext = theTransactionList; NdbConnection* tConNext = theTransactionList;
tConnection->init(); tConnection->init();
@ -434,7 +437,8 @@ Ndb::startTransactionLocal(Uint32 aPriority, Uint32 nodeId)
abort(); abort();
} }
#endif #endif
return tConnection; DBUG_PRINT("exit", ("transaction id: %d", tConnection->getTransactionId()));
DBUG_RETURN(tConnection);
}//Ndb::startTransactionLocal() }//Ndb::startTransactionLocal()
/***************************************************************************** /*****************************************************************************