summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed mdev-14880: Assertion `inj_cond_list.elements' failedbb-10.3-vicentiu-no-dtoaIgor Babaev2018-01-083-1/+88
| | | | | | | | in JOIN::inject_best_splitting_cond The value of SplM_opt_info::last_plan should be set to NULL before any search for a splitting plan for a splittable materialized table.
* MDEV-14881 cmake should succeed after installing libaio.Vladislav Vaintroub2018-01-071-0/+2
| | | | | | In case libaio is not found, and required, remove variables HAVE_LIBAIO_H and HAVE_LIBAIO from cache, so that cmake rerun after installation of libaio would succeed.
* Fix warningsVladislav Vaintroub2018-01-073-3/+3
|
* Fix warningsVladislav Vaintroub2018-01-062-3/+3
|
* Merge bb-10.2-ext into 10.3Marko Mäkelä2018-01-0573-5588/+2051
|\
| * Fix a -Wimplicit-fallthrough warningMarko Mäkelä2018-01-051-2/+3
| |
| * Fix a warning about extra parenthesisMarko Mäkelä2018-01-051-3/+2
| |
| * Fix warningVladislav Vaintroub2018-01-051-1/+2
| |
| * Fix warningsVladislav Vaintroub2018-01-053-8/+7
| |
| * Merge remote-tracking branch 'origin/10.2' into bb-10.2-extMonty2018-01-0576-5591/+2059
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mysql-test/r/cte_nonrecursive.result mysql-test/suite/galera/r/galera_bf_abort.result mysql-test/suite/galera/r/galera_bf_abort_get_lock.result mysql-test/suite/galera/r/galera_bf_abort_sleep.result mysql-test/suite/galera/r/galera_enum.result mysql-test/suite/galera/r/galera_fk_conflict.result mysql-test/suite/galera/r/galera_insert_multi.result mysql-test/suite/galera/r/galera_many_indexes.result mysql-test/suite/galera/r/galera_mdl_race.result mysql-test/suite/galera/r/galera_nopk_bit.result mysql-test/suite/galera/r/galera_nopk_blob.result mysql-test/suite/galera/r/galera_nopk_large_varchar.result mysql-test/suite/galera/r/galera_nopk_unicode.result mysql-test/suite/galera/r/galera_pk_bigint_signed.result mysql-test/suite/galera/r/galera_pk_bigint_unsigned.result mysql-test/suite/galera/r/galera_serializable.result mysql-test/suite/galera/r/galera_toi_drop_database.result mysql-test/suite/galera/r/galera_toi_lock_exclusive.result mysql-test/suite/galera/r/galera_toi_truncate.result mysql-test/suite/galera/r/galera_unicode_pk.result mysql-test/suite/galera/r/galera_var_auto_inc_control_off.result mysql-test/suite/galera/r/galera_wsrep_log_conficts.result sql/field.cc sql/rpl_gtid.cc sql/share/errmsg-utf8.txt sql/sql_acl.cc sql/sql_parse.cc sql/sql_partition_admin.cc sql/sql_prepare.cc sql/sql_repl.cc sql/sql_table.cc sql/sql_yacc.yy
| | * Merge 10.1 into 10.2Marko Mäkelä2018-01-053-5/+9
| | |\
| | | * Tests: detect table count for some encryption testsAleksey Midenkov2018-01-053-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debug_key_management encrypt_and_grep innodb_encryption If real table count is different from what is expected by the test, it just hangs on waiting to fulfill hardcoded number. And then exits with **failed** after 10 minutes of wait: quite unfriendly and hard to figure out what's going on.
| | * | MDEV-14059 Work around a problem exposed by InnoDB GIS debug checkMarko Mäkelä2018-01-054-32/+63
| | | | | | | | | | | | | | | | | | | | row_sel_get_clust_rec_for_mysql(): Look up the page from the buffer pool, similar to how MySQL 5.7 does it.
| | * | Merge branch 10.1 into 10.2Marko Mäkelä2018-01-042-7/+9
| | |\ \ | | | |/
| | | * Merge 10.0 into 10.1Marko Mäkelä2018-01-042-8/+10
| | | |\
| | | | * Fix a truncation warning introduced in MDEV-12323Marko Mäkelä2018-01-042-6/+8
| | | | |
| | * | | MDEV-14057 InnoDB GIS tests failMarko Mäkelä2018-01-0428-5475/+1909
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix and enable some of the tests; some remain disabled. The tests innodb_gis.rtree_old and innodb_gis.row_format duplicated some versions of the test main.gis-rtree. Instead of duplicating, source that test, in a new test innodb_gis.innodb_gis_rtree. Introduce innodb_row_format.combinations. Due to this, ROW_FORMAT=COMPRESSED will not be covered in some tests where it is covered in MySQL 5.7.
| | * | | MDEV-14058 InnoDB Assertion failure !leaf on rem0rec.cc line 566 on test ↵Marko Mäkelä2018-01-043-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innodb_gis.rtree_recovery The function rtr_update_mbr_field_in_place() is generating MLOG_REC_UPDATE_IN_PLACE or MLOG_COMP_REC_UPDATE_IN_PLACE records on non-leaf pages, even though MLOG_WRITE_STRING would perfectly suffice for updating a fixed-length data field. btr_cur_parse_update_in_place(): If flags==7, the record may be from rtr_update_mbr_field_in_place(), and we must check if the page is a leaf page. Otherwise, assume that it is. btr_cur_update_in_place(): Assert that the page is a leaf page.
| | * | | bump the VERSIONDaniel Bartholomew2018-01-041-1/+1
| | | | |
| | * | | Fixed wrong arguments to printf and related functionsMonty2018-01-0447-101/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other things, mainly to get create_mysqld_error_find_printf_error tool to work: - Added protection to not include mysqld_error.h twice - Include "unireg.h" instead of "mysqld_error.h" in server - Added protection if ER_XX messages are already defined - Removed wrong calls to my_error(ER_OUTOFMEMORY) as my_malloc() and my_alloc will do this automatically - Added missing %s to ER_DUP_QUERY_NAME - Removed old and wrong calls to my_strerror() when using MY_ERROR_ON_RENAME (wrong merge) - Fixed deadlock error message from Galera. Before the extra information given to ER_LOCK_DEADLOCK was missing because ER_LOCK_DEADLOCK doesn't provide any extra information. I kept #ifdef mysqld_error_find_printf_error_used in sql_acl.h to make it easy to do this kind of check again in the future
| | * | | Fix out-of-date comments.Sergei Petrunia2018-01-042-2/+2
| | | | |
* | | | | row_upd_rec_in_place(): Relax a debug assertionMarko Mäkelä2018-01-051-1/+11
| | | | |
* | | | | Merge pull request #534 from tempesta-tech/upstream/test_innodb_encryptionJan Lindström2018-01-053-5/+9
|\ \ \ \ \ | | | | | | | | | | | | Tests: detect table count for some encryption tests
| * | | | | Tests: detect table count for some encryption testsAleksey Midenkov2018-01-043-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debug_key_management encrypt_and_grep innodb_encryption If real table count is different from what is expected by the test, it just hangs on waiting to fulfill hardcoded number. And then exits with **failed** after 10 minutes of wait: quite unfriendly and hard to figure out what's going on.
* | | | | | Relax a bogus debug assertionMarko Mäkelä2018-01-041-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | While insert direction makes no sense for SPATIAL INDEX (R-tree), the field is apparently being used (and basically garbage). Relax the debug assertion that was added in MDEV-11369.
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-01-04209-1508/+6854
|\ \ \ \ \ | |/ / / /
| * | | | Do not misspell "fall through"Marko Mäkelä2018-01-031-1/+1
| | | | |
| * | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2018-01-035-17/+16
| |\ \ \ \ | | |/ / /
| | * | | Do not misspell "fall through"Marko Mäkelä2018-01-032-2/+1
| | | | |
| | * | | Merge 10.1 into 10.2Marko Mäkelä2018-01-033-15/+15
| | |\ \ \ | | | |/ /
| | | * | Merge 10.0 into 10.1Marko Mäkelä2018-01-033-15/+15
| | | |\ \ | | | | |/
| | | | * Merge 5.5 into 10.0Marko Mäkelä2018-01-033-15/+15
| | | | |\
| | | | | * Silence some -Wimplicit-fallthrough by proper spellingMarko Mäkelä2018-01-033-15/+15
| | | | | |
| * | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2018-01-0325-69/+659
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.1 into 10.2, with some MDEV-14799 fixupsmariadb-10.2.12Marko Mäkelä2018-01-0320-55/+642
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trx_undo_page_report_modify(): For SPATIAL INDEX, keep logging updated off-page columns twice, so that the minimum bounding rectangle (MBR) will be logged. Avoiding the redundant logging would require larger changes to the undo log format. row_build_index_entry_low(): Handle SPATIAL_UNKNOWN more robustly, by refusing to purge the record from the spatial index. We can get this code when processing old undo log from 10.2.10 or 10.2.11 (the releases affected by MDEV-14799, which was a regression from MDEV-14051).
| | | * | | Merge 10.0 into 10.1Marko Mäkelä2018-01-0215-25/+318
| | | |\ \ \ | | | | |/ /
| | | | * | Merge 5.5 into 10.0Marko Mäkelä2018-01-0214-23/+134
| | | | |\ \ | | | | | |/
| | | | | * Follow-up to MDEV-14799: Remove bogus debug assertionsMarko Mäkelä2018-01-022-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trx_undo_rec_get_partial_row(): When the PRIMARY KEY includes a column prefix of an externally stored column, the already parsed part of the undo log record may contain a reference to an off-page column. This is the case in the bug58912 test in innodb.innodb.
| | | | | * MDEV-14799 After UPDATE of indexed columns, old values will not be purged ↵Marko Mäkelä2018-01-026-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from secondary indexes This is a regression caused by MDEV-14051 'Undo log record is too big.' Purge in the secondary index is wrongly skipped in row_purge_upd_exist_or_extern() because node->row only does not contain all indexed columns. trx_undo_rec_get_partial_row(): Add the parameter for node->update so that the updated columns will be copied from the initial part of the undo log record.
| | | | | * MDEV-14309 MTR tests require perl-Env which is not always in the default ↵Sergei Golubchik2017-12-272-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installation * don't use Env module in tests, use $ENV{xxx} instead * collateral changes: ** $file in the error message was unset ** $file in the other error message was unset too :) ** source file arguments are conventionally upper-cased ** abort the test (die) on error, don't just echo/exit
| | | | | * MDEV-10657: incorrect result returned with binary protocol (prepared statements)Oleksandr Byelkin2017-12-276-3/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If translation table present when we materialize the derived table then change it to point to the materialized table. Added debug info to see really what happens with what derived.
| | | | * | Update mysqladmin man pageIan Gilfillan2017-12-281-2/+184
| | | | | |
| | * | | | MDEV-13568 gcol.innodb_virtual_debug_purge failed in buildbot with wrong resultMarko Mäkelä2018-01-036-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The InnoDB background tasks can modify tables while LOCK TABLES...WRITE is in effect. The purge of InnoDB history always worked like this in MariaDB, but in MySQL 5.7 it sometimes yields to LOCK TABLES. Also, make gcol.innodb_virtual_index run the purge for an UPDATE before DROP TABLE is executed.
| * | | | | Follow-up fix of MDEV-14717 RENAME TABLE in InnoDB is not crash-safeMarko Mäkelä2018-01-031-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trx_undo_page_report_rename(): Return a pointer to the start of the undo log record, not to the start of the (not yet written) next free record. The wrong return value would sometimes cause ROLLBACK to crash in an assertion failure (trying to parse garbage from the free area at the end of the insert_undo log page) if the TRX_UNDO_RENAME_TABLE record was the very last thing that was written to the insert_undo log. This would occasionally happen when an ALTER TABLE operation is rolled back due to invalid FOREIGN KEY constraints in the innodb.innodb test. In these tests, the error ER_ERROR_ON_RENAME (1025) would be returned at the end of the ALGORITHM=COPY operation of ALTER TABLE.
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extMonty2018-01-037-68/+182
| |\ \ \ \ \ | | |/ / / /
| | * | | | More output in galera.query_cache.testMonty2018-01-032-59/+160
| | | | | | | | | | | | | | | | | | | | | | | | This is to be able to better track where things goes wrong
| | * | | | Fixed compiler warningMonty2018-01-031-1/+1
| | | | | |
| | * | | | MDEV-14813 rpl.rpl_ctype_latin1 fails in buildbot on Mac with wrong resultMonty2018-01-032-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make rpl_ctype_latin1 more portable by printing names in hex Also only run if lower_case_table_names is 0, as this affects the result
| | * | | | Rocksdb fails to build when the source and build directory are not the same. ↵Varun Gupta2018-01-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up fix for MDEV-12458
| | * | | | Disable warnings in partion_alter_myisamMonty2018-01-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled warnings for directory option as this is depending on compilation options.