lp:~atcurtis/maria/5.5-dfly

Created by Antony T Curtis and last modified
Get this branch:
bzr branch lp:~atcurtis/maria/5.5-dfly
Only Antony T Curtis can upload to this branch. If you are Antony T Curtis please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Antony T Curtis
Project:
MariaDB
Status:
Development

Recent revisions

3493. By Antony T Curtis

Simple change to permit building on DragonFlyBSD

3492. By Kristian Nielsen

MDEV-450: Deadlock between starting a slave and reading system variables

Starting the SQL thread might deadlock with reading the values of the
replication filtering options.

The deadlock is due to a lock order violation when the variables are
read or set. For example, reading replicate_ignore_table first
acquires LOCK_global_system_variables in sys_var::value_ptr and later
acquires LOCK_active_mi in Sys_var_rpl_filter::global_value_ptr. This
violates the order established when starting a SQL thread, where
LOCK_active_mi is acquired before start_slave, and ends up creating a
thread (handle_slave_sql) that allocates a THD handle whose
constructor acquires LOCK_global_system_variables in THD::init.

The solution is to unlock LOCK_global_system_variables before the
replication filtering options are set or read. This way the lock
order is preserved and the data being read/set is still protected
given that it acquires LOCK_active_mi.

3491. By Sergei Golubchik

MDEV-364 Server crashes in add_identifier on concurrent ALTER TABLE and SHOW ENGINE INNODB STATUS

fix add_identifier() to distinguish between temporary tables (#sql- prefix) and temporary partitions (#TMP# suffix).
change add_identifier() to use the same name variant constants as sql_partition.cc does.

3490. By Sergei Golubchik

MDEV-286 mytop is not installed in 5.5

include mytop in bintars, rpms, and debs.
install mysqlbug.1 too.

3489. By Sergei Golubchik

MDEV-336 oqgraph 5.5 crashes in buildbot

compile oqgraph with -fno-strict-aliasing

3488. By Sergei Golubchik

compiler warnings

3487. By Sergei Golubchik

fix val_str_ascii to return a string in the ascii-compatible charset.
two items didn't do that properly, one was exploitable, the other was not, but fixed anyway.

3486. By Sergei Golubchik

merge with MySQL 5.5.27

manually checked every change, reverted incorrect or stupid changes.

3485. By Sergei Golubchik

MDEV-392 MTR: skip-combinations option is declared in help, but is ignored

remove unused mtr option

3484. By Michael Widenius

Fixed compiler warnings

Branch metadata

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

Subscribers