diff options
author | Michael Widenius <monty@askmonty.org> | 2011-07-25 21:52:15 -0700 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2011-07-25 21:52:15 -0700 |
commit | 1d61f71384f031fe7cc000fd7efd38bef44c0302 (patch) | |
tree | fa8b80f1a7240783ff4b159ed05afd6f51c8e973 /.bzrignore | |
parent | 678f4b2de17a6fa42a056422feb7d7c7f24092da (diff) | |
parent | db9291fa2201e51b29713966612a589c9aa025fd (diff) | |
download | mariadb-git-1d61f71384f031fe7cc000fd7efd38bef44c0302.tar.gz |
Merge with 5.1
Fixed lp:814237: Wrong mutex usage in Aria
storage/maria/ma_bitmap.c:
Added call to _ma_bitmap_mark_file_changed() when flushing bitmap. This fixes lp:814237
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 375381c4606..6b18d09723b 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1960,3 +1960,4 @@ scripts/convert-debug-for-diff client/strings_def.h libmysql/strings_def.h libmysql_r/strings_def.h +storage/maria/aria_log_control |