summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-13591: InnoDB: Database page corruption on disk or a failed file read ↵bb-10.1-MDEV-13591Jan Lindström2017-08-2310-54/+118
| | | | | | | | | | | | | | | | | | | | and assertion failure Problem is that page 0 and its possible enrryption information is not read for undo tablespaces. fil_crypt_get_latest_key_version(): Do not send event to encryption threads if event does not yet exists. Seen on regression testing. fil_read_first_page: Add new parameter does page belong to undo tablespace and if it does, we do not read FSP_HEADER. srv_undo_tablespace_open : Read first page of the tablespace to get crypt_data if it exists and pass it to fil_space_create. Tested using innodb_encryption with combinations with innodb-undo-tablespaces.
* Combinations with innodb-undo-tablespaces to use in test filesElena Stepanova2017-08-232-0/+8
|
* MDEV-13608 : set client plugin directory with mysql_options()Vladislav Vaintroub2017-08-216-2/+56
| | | | if plugin_dir is specified. Also, allow to specify protocol (e.g pipe)
* MDEV-12988 backup fails if innodb_undo_tablespaces>0Marko Mäkelä2017-08-171-0/+12
| | | | | srv_undo_tablespaces_init(): In Mariabackup backup mode, do initialize the array of undo_tablespace_ids[].
* MDEV-13432: Assertion failure in buf0rea.cc line 577Jan Lindström2017-08-172-18/+25
| | | | | | Page read could return DB_PAGE_CORRUPTED error that should be reported and passed to upper layer. In case of unknown error code we should print both number and string.
* Merge branch '10.0' into 10.1Sergei Golubchik2017-08-152-4/+4
|\
| * compilation fix for SLES 11 SP4Sergei Golubchik2017-08-141-2/+2
| | | | | | | | also fix innodb
| * compilation fix for SLES 11 SP4Sergei Golubchik2017-08-131-2/+2
| |
* | MDEV-8579 - Some sysvars in I_S are missing any meaningful help (comment) textSergey Vojtovich2017-08-158-144/+157
| | | | | | | | Follow-up to original patch: fixing test cases.
* | MDEV-8579 Expand system variable documentation=Ian Gilfillan2017-08-151-56/+147
| |
* | allow OpenSSL 0.9.8 againSergei Golubchik2017-08-131-1/+1
| | | | | | | | | | | | | | this disables the check, added in d937916c06 Applications shouldn't police OpenSSL versions that users are using. And 0.9.8 on Mac OS X seems to have new fixes, despite being "0.9.8"
* | bump the VERSIONDaniel Bartholomew2017-08-101-1/+1
| |
* | Merge 10.0 into 10.1Marko Mäkelä2017-08-093-36/+7
|\ \ | |/
| * Revert an InnoDB Memcached plugin fix that was merged from MySQL 5.6.37Marko Mäkelä2017-08-093-36/+7
| | | | | | | | | | | | | | | | | | | | | | Revert the following change, because Memcached is not present in MariaDB Server. We had better avoid adding dead code. commit d9bc5e03d788b958ce8c76e157239953db60adb2 Author: Aakanksha Verma <aakanksha.verma@oracle.com> Date: Thu May 18 14:31:01 2017 +0530 Bug #24605783 MYSQL GOT SIGNAL 6 ASSERTION FAILURE
* | Updated list of unstable tests for 10.1.26 releasemariadb-10.1.26Elena Stepanova2017-08-091-49/+99
| |
* | MDEV-12725 select on federated table crashes serverSergei Golubchik2017-08-086-25/+64
| | | | | | | | | | | | | | | | | | NET can only store current_thd if this NET (or its MYSQL) is not moved between threads. In FederatedX MYSQL is part of the TABLE, and a TABLE can migrate between threads. Fix: associate NET with THD in txn->acquire() , and dissociate in txn->release()
* | MDEV-12863 No table can be created after second encryption plugin attempted ↵Sergei Golubchik2017-08-083-6/+37
| | | | | | | | | | | | | | to load when deinitializing encryption plugins, disable server-wide encryption only if this plugin is the one that is used for encryption.
* | Merge branch '10.0' into 10.1Sergei Golubchik2017-08-08313-2122/+36827
|\ \ | |/
| * bump the VERSIONDaniel Bartholomew2017-08-071-1/+1
| |
| * Merge branch 'bb-10.0-vicentiu' into 10.0mariadb-10.0.32Vicențiu Ciorbaru2017-08-04127-514/+34128
| |\ | | | | | | | | | Includes Percona XtraDB and TokuDB 5.6.36-82.1
| | * Disable rpl_tokudb_row_img_* testsbb-10.0-vicentiu-post-rewriteVicențiu Ciorbaru2017-08-0414-7/+7
| | | | | | | | | | | | | | | We need to pull rpl config files from MySQL before these tests can be run.
| | * Merge branch 'merge-tokudb-5.6' into 10.0Vicențiu Ciorbaru2017-08-0488-1087/+123
| | |\
| | | * Move tokudb_rpl to rpl-tokudb suiteVicențiu Ciorbaru2017-08-03186-0/+0
| | | |
| | * | Fix tokudb compilation post mergeVicențiu Ciorbaru2017-08-033-5/+6
| | | |
| | * | Merge branch 'merge-tokudb-5.6' into 10.0Vicențiu Ciorbaru2017-08-03118-479/+35042
| | |\ \ | | | |/
| | | * 5.6.36-82.1Vicențiu Ciorbaru2017-08-03118-521/+34166
| | | |
| | * | Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-08-023-3/+17
| | |\ \
| | | * | 5.6.36-82.1Vicențiu Ciorbaru2017-08-023-3/+18
| | | | |
| * | | | Remove extra trailing spaces from the result fileElena Stepanova2017-08-041-2/+2
| | | | |
| * | | | Additions to 10.0.32 unstable test list after TokuDB mergeElena Stepanova2017-08-041-1/+37
| | | | |
| * | | | MDEV-12972 Random and Frequent SegfaultMonty2017-08-033-16/+51
| |/ / / | | | | | | | | | | | | | | | | | | | | Problem was a memory overflow in MRR Reviewed by Sergei Petruna. Testcase by Elena
| * | | Merge connect/10.0 into 10.0Vicențiu Ciorbaru2017-08-0152-482/+1001
| | | | | | | | | | | | | | | | | | | | Squash all connect/10.0's commits into one and keep only changes from storage/connect directory.
| * | | MDEV-12915 ST_Centroid does not return the same result than MySQLElena Stepanova2017-08-016-16/+16
| | | | | | | | | | | | | | | | Fix storage_engine test results
| * | | Update myisam_debug test result post print_lock_error changeVicențiu Ciorbaru2017-08-011-1/+1
| | | |
| * | | Update innodb test result post print_lock_error changeVicențiu Ciorbaru2017-08-012-2/+2
| | | |
| * | | List of unstable tests for 10.0.32 releaseElena Stepanova2017-08-011-58/+74
| | | |
| * | | MDEV-9739 Assertion `m_status == DA_ERROR || m_status == DA_OK' failed in ↵Sergei Golubchik2017-08-011-0/+3
| | | | | | | | | | | | | | | | Diagnostics_area::message() ; connect.xml* tests fail in buildbot
| * | | MDEV-8453 Alter table not returning engine errorsSergei Golubchik2017-08-014-34/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | remove ~15 years old print_lock_error() function, use handler::print_error() instead Backport from 10.1
| * | | MDEV-12915 ST_Centroid does not return the same result than MySQL.Alexey Botchkov2017-08-011-5/+5
| | | | | | | | | | | | | | | | Test fixed for IA64.
| * | | MDEV-12915 ST_Centroid does not return the same result than MySQL.Alexey Botchkov2017-08-014-14/+29
| | | | | | | | | | | | | | | | Calculation of the polygon's centroid fixed.
| * | | Merge branch 'merge-pcre' into 10.0Vicențiu Ciorbaru2017-07-3031-521/+825
| |\ \ \
| | * | | 8.41Vicențiu Ciorbaru2017-07-3058-3881/+4299
| | | | |
| * | | | Merge branch 'merge-perfschema-5.6' into 10.0Vicențiu Ciorbaru2017-07-300-0/+0
| |\ \ \ \
| | * | | | 5.6.37 (no-changes)Vicențiu Ciorbaru2017-07-300-0/+0
| | | | | |
| * | | | | Bump innodb version post mergeVicențiu Ciorbaru2017-07-301-1/+1
| | | | | |
| * | | | | Merge remote-tracking branch 'merge/merge-innodb-5.6' into 10.0Vicențiu Ciorbaru2017-07-297-33/+127
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following merge from 5.6.36, this merge also rejects changes that collided with the rejection of 6ca4f693c1ce472e2b1bf7392607c2d1124b4293. We initially rejected 6ca4f693c1ce472e2b1bf7392607c2d1124b4293 because it was introducing a new storage engine API method.
| | * | | | | 5.6.37Vicențiu Ciorbaru2017-07-297-52/+176
| | | | | | |
| * | | | | | Update subselect test results to pass on 10.0Vicențiu Ciorbaru2017-07-297-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One query was removed due to inconsistent behaviour with subquery cache enabled vs disabled. MDEV-13399 has been created to track this change and fix.
| * | | | | | Fix purge_relay_logs post mergeVicențiu Ciorbaru2017-07-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slave_skip_counter must not be reset to 0 during purge_relay_logs. See MDEV-4937 as to when this change happened.
| * | | | | | MYSQL_BIN_LOG::open/close must be under LOCK_logSergei Golubchik2017-07-271-2/+11
| | | | | | |