Michael Widenius 1d61f71384 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

2011-07-25 21:52:15 -07:00

..

archive

Fixes BUG#60976 "Crash, valgrind warning and memory leak with partitioned archive tables"

2011-06-11 14:28:15 +03:00

blackhole

merge

2010-12-06 13:16:49 +01:00

csv

merge

2010-12-06 13:16:49 +01:00

example

small enhancement of the create table options feature:

2011-05-10 18:19:11 +02:00

federated

Merge with 5.1

2011-01-12 17:38:13 +02:00

federatedx

Merge with 5.1 to get in changes from MySQL 5.1.55

2011-02-28 19:39:30 +02:00

heap

Merge with 5.1

2011-06-24 12:13:03 +03:00

ibmdb2i

Fixed typos

2011-01-07 13:45:59 +02:00

innobase

Merge with MySQL 5.1.57/58

2011-05-02 20:58:45 +03:00

innodb_plugin

Merge with MariaDB 5.1

2011-05-03 19:10:10 +03:00

maria

Merge with 5.1

2011-07-25 21:52:15 -07:00

myisam

Fixed several errors in Aria discovered by test case for lp:727869 ma_pagecache.c:2103: find_block: Assertion `block->rlocks == 0

2011-06-24 12:08:45 +03:00

myisammrg

Merge with MariaDB 5.1

2011-05-03 19:10:10 +03:00

ndb

Merge with 5.1 to get in changes from MySQL 5.1.55

2011-02-28 19:39:30 +02:00

oqgraph

Detect Boost installation and build OQGRAPH when possible. For now, disable oqgraph on x64 until

2011-04-10 22:48:28 -07:00

pbxt

Change in PBXT to only use pth_set_priority() (not setpriority()) to set priority

2011-06-13 16:57:11 +03:00

sphinx

MBug#691437: storage/sphinx/plug.in missing from source tarball.

2010-12-17 08:33:36 +01:00

xtradb

Fix Windows embedded warnings

2011-05-10 18:18:25 +02:00

Makefile.am

Merge with MySQL 5.1.50

2010-08-27 17:12:44 +03:00

mysql_storage_engine.cmake

Small CMake fixes :

2011-05-15 13:38:18 +02:00