1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automatic merge with 5.1-release

Browse Source
This commit is contained in:
Michael Widenius 2010-12-04 23:00:22 +02:00
commit dfefc15db4
5 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
storage/maria/ma_pagecache.c
View File

@ -1046,7 +1046,6 @@ static inline void dec_counter_for_resize_op(PAGECACHE *pagecache)
("thread %ld", last_thread->next->id)); ("thread %ld", last_thread->next->id));
pagecache_pthread_cond_signal(&last_thread->next->suspend); pagecache_pthread_cond_signal(&last_thread->next->suspend);
} }
DBUG_ASSERT((longlong) pagecache->cnt_for_resize_op >= 0);
#else #else
pagecache->cnt_for_resize_op--; pagecache->cnt_for_resize_op--;
#endif #endif

1
storage/maria/unittest/ma_pagecache_consist.c
View File

@ -476,6 +476,7 @@ int main(int argc __attribute__((unused)),
pthread_mutex_unlock(&LOCK_thread_count); pthread_mutex_unlock(&LOCK_thread_count);
DBUG_PRINT("info", ("thread ended")); DBUG_PRINT("info", ("thread ended"));
flush_pagecache_blocks(&pagecache, &file1, FLUSH_IGNORE_CHANGED);
end_pagecache(&pagecache, 1); end_pagecache(&pagecache, 1);
DBUG_PRINT("info", ("Page cache ended")); DBUG_PRINT("info", ("Page cache ended"));

1
storage/maria/unittest/ma_pagecache_rwconsist.c
View File

@ -341,6 +341,7 @@ int main(int argc __attribute__((unused)),
pthread_mutex_unlock(&LOCK_thread_count); pthread_mutex_unlock(&LOCK_thread_count);
DBUG_PRINT("info", ("thread ended")); DBUG_PRINT("info", ("thread ended"));
flush_pagecache_blocks(&pagecache, &file1, FLUSH_IGNORE_CHANGED);
end_pagecache(&pagecache, 1); end_pagecache(&pagecache, 1);
DBUG_PRINT("info", ("Page cache ended")); DBUG_PRINT("info", ("Page cache ended"));

5
storage/maria/unittest/ma_test_loghandler_multithread-t.c
View File

@ -269,11 +269,6 @@ int main(int argc __attribute__((unused)),
int *param, error; int *param, error;
int rc; int rc;
/* Disabled until Sanja tests */
plan(1);
ok(1, "disabled");
exit(0);
plan(WRITERS + FLUSHERS + plan(WRITERS + FLUSHERS +
ITERATIONS * WRITERS * 3 + FLUSH_ITERATIONS * FLUSHERS ); ITERATIONS * WRITERS * 3 + FLUSH_ITERATIONS * FLUSHERS );

2
storage/maria/unittest/ma_test_loghandler_pagecache-t.c
View File

@ -168,7 +168,7 @@ int main(int argc __attribute__((unused)), char *argv[])
PAGECACHE_PIN_LEFT_UNPINNED, PAGECACHE_PIN_LEFT_UNPINNED,
PAGECACHE_WRITE_DELAY, PAGECACHE_WRITE_DELAY,
0, LSN_IMPOSSIBLE); 0, LSN_IMPOSSIBLE);
flush_pagecache_blocks(&pagecache, &file1, FLUSH_FORCE_WRITE); flush_pagecache_blocks(&pagecache, &file1, FLUSH_RELEASE);
} }
my_close(file1.file, MYF(MY_WME)); my_close(file1.file, MYF(MY_WME));
if ((file1.file= my_open(first_translog_file, O_RDONLY, MYF(MY_WME))) < 0) if ((file1.file= my_open(first_translog_file, O_RDONLY, MYF(MY_WME))) < 0)