Created by Lixun Peng (P.Linux) and last modified
Get this branch:
bzr branch lp:~maria-captains/maria/10.0-plinux
Members of Maria-captains can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information


Recent revisions

3440. By Lixun Peng (P.Linux)

Automatic merge

3439. By Lixun Peng (P.Linux)

Changed macro define (Written by Monty), using prefix to record the size of malloc.
Like this:
real_ptr return_ptr
| |
| |
| size | memory block |

3438. By Lixun Peng (P.Linux)

Pre-Thread Memory Usage Monitor. Solaris is not ready. MacOS/Linux/Windows/FreeBSD is ok.\n Detail: http://www.penglixun.com/tech/database/mysql_memory_usage_monitor.html

3437. By Lixun Peng (P.Linux)

Merge from 10.0-base

3436. By Lixun Peng (P.Linux)

Merge from 10.0-base

3435. By Michael Widenius

Automatic merge

3434. By Kristian Nielsen

MDEV-232: Remove one fsync() from commit phase.

Introduce a new storage engine API method commit_checkpoint_request().
This is used to replace the fsync() at the end of every storage engine
commit with a single fsync() when a binlog is rotated.

Binlog rotation is now done during group commit instead of being
delayed until unlog(), removing some server stall and avoiding an
expensive lock/unlock of LOCK_log inside unlog().

3433. By Kristian Nielsen

MDEV-181: XID crash recovery across binlog boundaries

Keep track of how many pending XIDs (transactions that are prepared in
storage engine and written into binlog, but not yet durably committed
on disk in the engine) there are in each binlog.

When the count of one binlog drops to zero, write a new binlog checkpoint
event, telling which is the oldest binlog with pending XIDs.

When doing XA recovery after a crash, check the last binlog checkpoint
event, and scan all binlog files from that point onwards for XIDs that
must be committed if found in prepared state inside engine.

Remove the code in binlog rotation that waits for all prepared XIDs to
be committed before writing a new binlog file (this is no longer necessary
when recovery can scan multiple binlog files).

3432. By Kristian Nielsen

MDEV-225: Replace with dummy events an event that is not understood by a slave to which it should be sent

Add function to replace arbitrary event with dummy event.

Add code which uses this to fix the bug that enabling row_annotate events
on the master breaks slaves which do not request such events.

Add that slaves set a variable @mariadb_slave_capability to inform the
master in a robust way about which events it can, and cannot, handle.

Add tests.

3431. By Sergei Golubchik

MDEV-457 Inconsistent data truncation on datetime values with fractional seconds represented as strings with no delimiters

New implementation for str_to_datetime. Fix MDEV-457 and related issues.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.