summaryrefslogtreecommitdiff
path: root/storage/xtradb/mtr
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.0 into 10.1Marko Mäkelä2017-03-091-1/+0
|\ | | | | | | | | | | | | | | | | Also, implement MDEV-11027 a little differently from 5.5 and 10.0: recv_apply_hashed_log_recs(): Change the return type back to void (DB_SUCCESS was always returned). Report progress also via systemd using sd_notifyf().
| * Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-1/+0
| |\
| | * Fix gcc 6.3.x compiler warnings.Jan Lindström2017-02-161-1/+0
| | | | | | | | | | | | | | | | | | These are caused by fact that functions are declared with __attribute__((nonnull)) or left shit like ~0 << macro when ~0U << macro should be used.
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-4/+4
|\ \ \ | |/ /
| * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-08-101-4/+4
| |\ \ | | | | | | | | | | | | 5.6.31-77.0
| | * | 5.6.31-77.0Sergei Golubchik2016-08-101-4/+4
| | | |
* | | | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-271-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2015-06-161-1/+1
| |\ \ \ | | |/ /
| | * | 5.6.24-72.2Sergei Golubchik2015-06-161-1/+1
| | | |
| | * | move to storage/xtradbSergei Golubchik2015-05-042-0/+1050
| | /
* | | Push for testing of encryptionMonty2015-02-102-4/+48
|/ /
* | MDEV-6184 10.0.11 mergeSergei Golubchik2014-05-061-1/+1
| | | | | | | | XtraDB 5.6.16-64.2
* | Percona-Server-5.6.15-rel63.0.tar.gz mergeSergei Golubchik2014-02-261-13/+16
| |
* | Percona-Server-5.6.14-rel62.0 mergeSergei Golubchik2013-12-222-118/+133
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | support ha_innodb.so as a dynamic plugin. * remove obsolete *,innodb_plugin.rdiff files * s/--plugin-load=/--plugin-load-add=/ * MYSQL_PLUGIN_IMPORT glob_hostname[] * use my_error instead of push_warning_printf(ER_DEFAULT) * don't use tdc_size and tc_size in a module update test cases (XtraDB is 5.6.14, InnoDB is 5.6.10) * copy new tests over * disable some tests for (old) InnoDB * delete XtraDB tests that no longer apply small compatibility changes: * s/HTON_EXTENDED_KEYS/HTON_SUPPORTS_EXTENDED_KEYS/ * revert unnecessary InnoDB changes to make it a bit closer to the upstream fix XtraDB to compile on Windows (both as a static and a dynamic plugin) disable XtraDB on Windows (deadlocks) and where no atomic ops are available (e.g. CentOS 5) storage/innobase/handler/ha_innodb.cc: revert few unnecessary changes to make it a bit closer to the original InnoDB storage/innobase/include/univ.i: correct the version to match what it was merged from
* Percona-Server-5.5.33-rel31.1.tar.gzSergei Golubchik2013-09-071-2/+2
|
* merge Percona-Server-5.5.32-rel31.0.tar.gzSergei Golubchik2013-07-161-73/+76
|
* Merge with XtraDB as of Percona-Server-5.5.30-rel30.2Sergei Golubchik2013-05-081-4/+35
|
* merged with XtraDB 1.1.8-26.0Sergei Golubchik2012-06-151-3/+3
|
* Merge XtraDB from Percona-server-5.5.17-rel22.1 into MariaDB 5.5unknown2011-12-151-38/+0
|
* merge with xtradb-5.5.15Sergei Golubchik2011-07-182-83/+107
| | | | fix test cases
* After-merge fixes for MySQL 5.1.46 merge into MariaDB: result file update ↵unknown2010-04-281-1/+1
| | | | and compiler warning removals.
* Merge XtraDB 9 into MariaDB.unknown2010-01-151-3/+5
|
* Merge XtraDB 8 into MariaDB.unknown2009-11-132-108/+123
|
* Fix most Compiler warnings seen in buildbot.unknown2009-09-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add suppressions for a few warnings that cannot be meaningfully fixed by MariaDB developers. Changes for XtraDB, PBXT, and YaSSL also submitted upstream. Also add a `ccfilter` wrapper that can be used to filter out suppressed warnings in a local build (to check that new warnings are not introduced). client/mysqlbinlog.cc: Fix compiler warnings. config/ac-macros/misc.m4: Fix wrong naming, autoconfig requires _cv_ in cached names. extra/yassl/include/yassl_int.hpp: Fix compiler warnings. extra/yassl/src/handshake.cpp: Fix compiler warnings. extra/yassl/src/yassl_imp.cpp: Fix compiler warnings. extra/yassl/src/yassl_int.cpp: Fix compiler warnings. extra/yassl/taocrypt/include/modes.hpp: Fix compiler warnings. extra/yassl/taocrypt/src/asn.cpp: Fix compiler warnings. mysys/my_compress.c: Fix compiler warnings. sql/mysqld.cc: Fix compiler warnings. sql/strfunc.cc: Fix compiler warnings. storage/pbxt/src/discover_xt.cc: Fix compiler warnings. storage/xtradb/fil/fil0fil.c: Fix compiler warnings. storage/xtradb/mtr/mtr0mtr.c: Fix compiler warnings. storage/xtradb/srv/srv0srv.c: Fix compiler warnings. storage/xtradb/srv/srv0start.c: Fix compiler warnings. strings/decimal.c: Fix compiler warnings. support-files/ccfilter: Add helper for suppressing compiler warnings in local developer source tree. Allows to check for not introducing new warnings into Buildbot without having to actually run the build through Buildbot. support-files/compiler_warnings.supp: Suppress a few warnings that cannot be meaningfully fixed in source code.
* Merge XtraDB 6 into MariaDB.unknown2009-08-031-2/+43
|
* Import Percona XtraDB into the MariaDB source tree.unknown2009-06-092-0/+954
View Lorry Controller Status