MariaDB

maria:bb-10.3-svoj

  1. Git
  2. lp:maria
  3. bb-10.3-svoj
Last commit made on 2018-06-05
Get this branch:
git clone -b bb-10.3-svoj https://git.launchpad.net/maria

Branch merges

Branch information

Name:
bb-10.3-svoj
Repository:
lp:maria

Recent commits

3407dba... by Sergey Vojtovich

MDEV-16371 - Fix for memory write order inversion

my_atomic implementation for interruptable waits.

c5b3a27... by Sergey Vojtovich

MDEV-16371 - Fix for memory write order inversion

Removed incorrect usage of my_thread_var->mutex. Now it is used
exclusively for interruptable waits.

8bea886... by Sergey Vojtovich

MDEV-16371 - Fix for memory write order inversion

Completed condition variable waiting unification into
my_thread_interruptable_wait() and my_thread_interruptable_timedwait().

THD::enter_cond() and THD::exit_cond(): don't touch mysys_var anymore.
Instead use "interruptable condition variable waiting" API.

THD::exit_cond() doesn't unlock mutex anymore. This makes it symmetric
with THD::enter_cond(), which _doesn't_ acquire a mutex.
Besides it makes the next item possible...

Removed thread_var->current_mutex: not used anymore.

thread_var->current_cond doesn't have to be volatile anymore: sensitive
accesses are now protected by thread_var->mutex.

02b388f... by Sergey Vojtovich

MDEV-16371 - Fix for memory write order inversion

Unified condition variable waiting into my_thread_interruptable_wait()
and my_thread_interruptable_timedwait().

Note that sql/debug_sync.cc change is incomplete and requires subsequent
patch with enter_cond()/exit_cond() fixes.

44d4f00... by Sergey Vojtovich

MDEV-16371 - Fix for memory write order inversion

Hard-core my_thread_interrupt_wait() implementation: it won't return
until concurrent thread resets thread_var->current_cond.

Also it fixes thread_var->current_mutex and thread_var->mutex reverse
lock order, since it doesn't need to lock thread_var->current_mutex.

Note that this change alone is not fully functional. But it allows
subsequent patches that simplify interruptable waits further.

126cc35... by Sergey Vojtovich

MDEV-16371 - Fix for memory write order inversion

Unified condition variable wait interrupt into my_thread_interrupt_wait().

For some non-obvious reason we don't set `thread_var->abort= 1` for
delayed insert threads (and sometimes for system threads) in certain
cases. This behaviour was preserved, although it doesn't look alright.

Removed unused [thd_]set_mysys_var().

5a61fa9... by Vladislav Vaintroub

MDEV-16345 : No upgrade wizard in 10.3 in Windows packages.

Disable /permissive- flag, so MFC is found, and upgrade_wizard is built.

MFC code is not standard C++, so it doesn not play well with /permissive-

682e7b8... by Marko Mäkelä

MDEV-16334 Incorrect ALTER TABLE for changing column option

commit 2dbeebdb16436e3c2723cd483aaf21d93de799d6 accidentally changed
ALTER_COLUMN_OPTION and ALTER_COLUMN_STORAGE_TYPE to be separate flags.
InnoDB and Mroonga are only checking for the latter;
the example storage engine is checking for the former only.

The impact of this bug should be incorrect operation of Mroonga when
the column options GROONGA_TYPE, FLAGS are changed.

InnoDB does not define any column options, only table options,
so the flag ALTER_COLUMN_OPTION should never have been set.

Also, remove the unused flag ALTER_DROP_HISTORICAL.

c0f9771... by Marko Mäkelä

After-merge fixes

Fix type mismatches in the unit test mdev10259().

btr_search_info_get_ref_count(): Do not return early if !table->space.
We can simply access table->space_id even after the tablespace has
been discarded.

btr_get_search_latch(): Relax a debug assertion to allow
!index->table->space.

00677b3... by =?utf-8?b?T3R0byBLZWvDpGzDpGluZW4=?= <email address hidden>

Deb: Import default.mk instead of only the subset buildflags.mk

Include all the Makefiles that define variables that can be useful
within debian/rules. This includes buildflags.mk as well.

Use the standard variable names and don't define our own.