Last commit made on 2017-03-08
Get this branch:
git clone -b MDEV-10332

Branch merges

Branch information


Recent commits

f889773... by Georg Richter on 2017-03-08

Initial implementation for MDEV-10332:
  support for OpenSSL 1.1 and LibreSSL
  tested against OpenSSL 1.0.1, 1.0.2, 1.1.0, Yassl and LibreSSL
  not working on Windows with native SChannel support, due to wrong cipher mapping: Latter one requires push of CONC-241 fixes.
  Please note that OpenSSL 0.9.8 and OpenSSL 1.1.0 will not work: Even if the build succeeds, test cases will fail with various errors, especially when using different tls libraries or versions for client and server.

2bca412... by Marko Mäkelä on 2017-03-07


The InnoDB redo log record type MLOG_COMP_REC_SEC_DELETE_MARK has
been unused for a long time, and it has never been written after
WL#8845 introduced the redo log format identifier in MySQL 5.7.9
or MariaDB Server 10.2.2. Thus, removing the record type does not
constitute any functional change.

89d80c1... by Marko Mäkelä on 2017-03-01

Fix many -Wconversion warnings.

Define my_thread_id as an unsigned type, to avoid mismatch with
ulonglong. Change some parameters to this type.

Use size_t in a few more places.

Declare many flag constants as unsigned to avoid sign mismatch
when shifting bits or applying the unary ~ operator.

When applying the unary ~ operator to enum constants, explictly
cast the result to an unsigned type, because enum constants can
be treated as signed.

In InnoDB, change the source code line number parameters from
ulint to unsigned type. Also, make some InnoDB functions return
a narrower type (unsigned or uint32_t instead of ulint;
bool instead of ibool).

d2f5e62... by Daniel Black on 2017-01-23

travis: add gcc-4.8

f2c1e06... by Daniel Black on 2016-12-19


To facilitate multiple build types in Travis, the environment variable
MYSQL_{BUILD_CC,BUILD_CXX} will be passed to cmake if used. This will
fallback to $CC/$CXX otherwise.

Added MYSQL_COMPILER_LAUNCHER (usually ccache) which isn't supported
until cmake-3.4, which isn't in travis (trusty), but hopefully a later
version can use it or in CI systems other than travis.

Signed-off-by: Daniel Black <email address hidden>

20007c8... by Alexander Barkov on 2017-03-07

Merge branch 'grooverdan-10.2-MDEV-120555-test_binlog_stm_ctype_ucs' into 10.2

6ad42c6... by Alexander Barkov on 2017-03-07

Merge branch '10.2-MDEV-120555-test_binlog_stm_ctype_ucs' of into grooverdan-10.2-MDEV-120555-test_binlog_stm_ctype_ucs

5b07334... by Marko Mäkelä on 2017-03-06

Remove an unused declaration.

The function thd_supports_xa() was removed in MySQL 5.7 in WL#8843.

7331b83... by Marko Mäkelä on 2017-03-06

MDEV-9282 follow-up: Remove an unused variable.

Remove the unused variable innodb_calling_exit which was added
in MySQL 5.7 in an attempt to avoid failures in other threads when
an I/O thread calls exit().

Since MDEV-9282, InnoDB or XtraDB MariaDB Server is not calling
exit() at all, and the variable innodb_calling_exit was never set.

ff0530e... by Marko Mäkelä on 2017-03-03

MDEV-12121: Revert test adjustments for -DWITH_INNODB_AHI=OFF

Because the default build configuration of the server will remain
at -DWITH_INNODB_AHI=ON, we want to test the instrumentation.

We make and revert the test adjustments in separate commits on purpose,
so that this commit can be easily reverted later if the default
build configuration is changed to -DWITH_INNODB_AHI=OFF.