summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-13437 InnoDB: Failing assertion: !srv_read_only_mode in mtr0mtr.cc:322bb-10.0-mdev_13437-andreiandrelkin2017-08-2811-13/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assert was caused due to incorrect handling of --tc-heuristic-recover=ROLLBACK and --innodb-read-only=1 option combination. Innodb attempted rollback of a prepared transaction having no right to do so because of the latter option. Fixed with making Innodb to respect the read-only flag by innobase_{commit,rollback}_by_xid (Marko's contribution). LOCK_log mutex lock/unlock had to be added to cover MDEV-1438 "child" issue. The measure is confirmed by mysql sources as well. For testing of the conflicting option combination, mysql-test-run is made to export a new $MYSQLD_LAST_CMD. It holds the very last value generated by mtr.mysqld_start(). Even though the options have been also always stored in $mysqld->{'started_opts'} there were no access to them beyond the automatic server restart by mtr through the expect file interface. Effectively therefore $MYSQLD_LAST_CMD represents a more general interface to $mysqld->{'started_opts'} which can be used in wider scopes including server launch with incompatible options. Notice another existing method to restart the server with incompatible options relying on $MYSQLD_CMD is is aware of $mysqld->{'started_opts'} (the actual options that the server is launched by mtr). In order to use this method they would have to be provided manually. Note, at merging to 10.2 an added search++ macro should be renamed "back" to normal. It's being backparted to 10.0 "temporarily".
* MDEV-8960: Can't refer the same column twice in one ALTER TABLEJan Lindström2017-08-183-3/+136
| | | | | | | | | | | | | | | Problem was that if column was created in alter table when it was refered again it was not tried to find from list of current columns. mysql_prepare_alter_table: There is two cases (1) If alter table adds a new column and then later alter changes the field definition, there was no check from list of new columns, instead an incorrect error was given. (2) If alter table adds a new column and then later alter changes the default, there was no check from list of new columns, instead an incorrect error was given.
* 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
|
* 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
* 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
| | | | | |
* | | | | | move the error message where it belongsSergei Golubchik2017-07-271-1/+1
| | | | | |
* | | | | | update error messages for 10.0Sergei Golubchik2017-07-271-2/+2
| | | | | |
* | | | | | memory leak: add a missing end_relay_log_info()Sergei Golubchik2017-07-271-0/+1
| | | | | |
* | | | | | Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2017-07-2570-165/+817
|\ \ \ \ \ \
| * | | | | | bump the VERSIONDaniel Bartholomew2017-07-191-1/+1
| | | | | | |
| * | | | | | MDEV-13065 rpl.rpl_mdev-11092 fails sporadically in buildbotSachin Setiya2017-07-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem rpl.rpl_mdev-11092 fails in buildbot because after starting slave in wait_for_slave_sql_error_and_skip.inc slave is started but there may be chances that we have not skipped the last error and Last_SQL_Errno is still not zero untill the end of rpl_end.inc , which will compare Last_SQL_Errno to 0. So in this this case rpl_mdev-11092 fails. Solution After starting slave in wait_for_slave_sql_error_and_skip.inc we will wait for Last_SQL_Errno to become 0.
| * | | | | | Merge branch 'merge-xtradb-5.5' into 5.5mariadb-5.5.57Sergei Golubchik2017-07-1830-203/+244
| |\ \ \ \ \ \
| | * | | | | | 5.5.55-38.8Sergei Golubchik2017-07-1835-214/+255
| | | | | | | |
| | * | | | | | 5.5.53-38.5Sergei Golubchik2016-12-221-1/+1
| | | | | | | |
| * | | | | | | ensure that filename in COM_BINLOG_DUMP isn't too longSergei Golubchik2017-07-181-3/+6
| | | | | | | |
| * | | | | | | MDEV-12646: Apply fixes found by Coverity static analysis toolDaniel Black2017-07-182-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by: https://github.com/devexp-db/mariadb/blob/f27/mariadb-covscan-stroverflow.patch
| * | | | | | | MDEV-658: debian debug symbols require compat 9Daniel Black2017-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
| * | | | | | | Bug #24595639: INCORRECT BEHAVIOR IN QUERY WITH UNION AND GROUP BYSergei Golubchik2017-07-182-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test case