diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-15 14:46:35 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-15 14:46:35 +0400 |
| commit | 151e5d586cc59afb3c664d56d47265c964fe7fb1 (patch) | |
| tree | 1972ed60ad937e632cf111e7beafb2148a87efeb /storage/xtradb/srv | |
| parent | 2083b7ddfd85b2bab837b73cb8357afcc2e893d8 (diff) | |
| parent | b495b3db2346a98650946ad5907ba3fe164eadc7 (diff) | |
| download | mariadb-git-151e5d586cc59afb3c664d56d47265c964fe7fb1.tar.gz | |
Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge
Diffstat (limited to 'storage/xtradb/srv')
| -rw-r--r-- | storage/xtradb/srv/srv0srv.c | 3 | ||||
| -rw-r--r-- | storage/xtradb/srv/srv0start.c | 14 |
2 files changed, 2 insertions, 15 deletions
diff --git a/storage/xtradb/srv/srv0srv.c b/storage/xtradb/srv/srv0srv.c index c81a5e17f55..d261a69991c 100644 --- a/storage/xtradb/srv/srv0srv.c +++ b/storage/xtradb/srv/srv0srv.c @@ -1816,7 +1816,6 @@ srv_printf_innodb_monitor( ulint btr_search_sys_subtotal; ulint lock_sys_subtotal; ulint recv_sys_subtotal; - ulint io_counter_subtotal; ulint i; trx_t* trx; @@ -2696,6 +2695,8 @@ loop: ib_uint64_t level, bpl; buf_page_t* bpage; + mutex_exit(&(log_sys->mutex)); + mutex_exit(&(log_sys->mutex)); mutex_enter(&flush_list_mutex); diff --git a/storage/xtradb/srv/srv0start.c b/storage/xtradb/srv/srv0start.c index 9239af0cad5..7140b59964d 100644 --- a/storage/xtradb/srv/srv0start.c +++ b/storage/xtradb/srv/srv0start.c @@ -122,20 +122,6 @@ static char* srv_monitor_file_name; #define SRV_MAX_N_PENDING_SYNC_IOS 100 -/* Avoid warnings when using purify */ - -#ifdef HAVE_valgrind -static int inno_bcmp(register const char *s1, register const char *s2, - register uint len) -{ - while ((len-- != 0) && (*s1++ == *s2++)) - ; - - return(len + 1); -} -#define memcmp(A,B,C) inno_bcmp((A),(B),(C)) -#endif - static char* srv_parse_megabytes( |