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

[t:2996], make partial fix to test

Browse source 
git-svn-id: file:///svn/toku/tokudb@25518 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Zardosht Kasheff 2013-04-16 23:59:26 -04:00 • committed by Yoni Fogel
parent 253ea7db96
commit ca6a765e29
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/tests/directory_lock.c
View file

@ -7,16 +7,16 @@ const int envflags = DB_INIT_MPOOL|DB_CREATE|DB_THREAD |DB_INIT_LOCK|DB_INIT_LOG
static int
put_multiple_callback(DB *dest_db, DB *src_db, DBT *dest_key, DBT *dest_val, const DBT *src_key, const DBT *src_val, void *extra) {
put_multiple_callback(DB *dest_db __attribute__((unused)), DB *src_db __attribute__((unused)), DBT *dest_key __attribute__((unused)), DBT *dest_val __attribute__((unused)), const DBT *src_key __attribute__((unused)), const DBT *src_val __attribute__((unused)), void *extra __attribute__((unused))) {
return 0;
}
static int
del_multiple_callback(DB *dest_db, DB *src_db, DBT *dest_key, const DBT *src_key, const DBT *src_val, void *extra) {
del_multiple_callback(DB *dest_db __attribute__((unused)), DB *src_db __attribute__((unused)), DBT *dest_key __attribute__((unused)), const DBT *src_key __attribute__((unused)), const DBT *src_val __attribute__((unused)), void *extra __attribute__((unused))) {
return 0;
}
void verify_shared_ops_fail(DB_ENV* env, DB* db) {
static void verify_shared_ops_fail(DB_ENV* env, DB* db) {
int r;
DB_TXN* txn = NULL;
u_int32_t flags = DB_YESOVERWRITE;
@ -132,7 +132,7 @@ void verify_shared_ops_fail(DB_ENV* env, DB* db) {
}
void verify_excl_ops_fail(DB_ENV* env, DB* db) {
static void verify_excl_ops_fail(DB_ENV* env, DB* db) {
DB_TXN* txn = NULL;
int r;
DB_LOADER* loader = NULL;
@ -144,10 +144,10 @@ void verify_excl_ops_fail(DB_ENV* env, DB* db) {
CKERR2(r, DB_LOCK_NOTGRANTED);
r = txn->commit(txn,0); CKERR(r);
//r = env->txn_begin(env, NULL, &txn, 0); CKERR(r);
//r = env->create_loader(env, txn, &loader, NULL, 1, &db, &put_flags, &dbt_flags, 0);
//CKERR2(r, DB_LOCK_NOTGRANTED);
//r = txn->commit(txn,0); CKERR(r);
r = env->txn_begin(env, NULL, &txn, 0); CKERR(r);
r = env->create_loader(env, txn, &loader, NULL, 1, &db, &put_flags, &dbt_flags, 0);
//CKERR2(r, -1);
r = txn->commit(txn,0); CKERR(r);
}