summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* smaller stack size on quantal-x86 and wheezy-x86Sergei Golubchik2017-10-102-13/+13
| | | | fixes failures of func_regexp_pcre
* Fix oqgraph compilation with Boost versions <=1.49Vicențiu Ciorbaru2017-10-091-1/+1
|
* MDEV-13412 main.func_regexp_pcre fails in buildbot on ppc64leSergei Golubchik2017-10-095-18/+36
| | | | | | | | | | | | | | | | | Caused by 2fcd8c12522. It used the documented pcre API -pcre_exec(NULL, NULL, NULL, -999, -999, 0, NULL, 0) to calculate the pcre stack frame size. Unfortunately, modern compilers broke it by cloning and inlining pcre match() function. 2fcd8c12522 tried to workaround it by setting the stack frame size to at least 500. It didn't work, 500 is not a universal constant. Now we fix our copy of pcre to not inline or clone match() - so that stack frame detection would work again - and detect at cmake time whether system pcre is broken or usable. Also use stack, not (much slower) malloc in bundled pcre, unless on Windows
* MDEV-10980: Fix reverse queries in OQGRAPH.Heinz Wiesinger2017-10-097-202/+190
|
* MDEV-13446 fts_create_doc_id() unnecessarily allocates 8 bytes for every ↵Marko Mäkelä2017-10-096-136/+62
| | | | | | | | | | | | inserted row fts_create_doc_id(): Remove. row_mysql_convert_row_to_innobase(): Implement the logic of fts_create_doc_id(). Reuse a buffer for the hidden FTS_DOC_ID. row_get_prebuilt_insert_row(): Allocate a buffer for the hidden FTS_DOC_ID at the end of prebuilt->ins_upd_rec_buff.
* MDEV-12263 Feature: skipped test fileElena Stepanova2017-10-091-6/+5
| | | | Post-fix: RedHat does not use rh-skipped-tests.list anymore
* MDEV-12263 Feature: skipped test fileElena Stepanova2017-10-091-41/+61
| | | | | | A note about unstable-tests lists in mysql-test/README, RedHat version of it, and also various changes to bring the file up-to-date
* MDEV-9886 Illegal mix of collations with a view comparing a field to a ↵Alexander Barkov2017-10-075-1/+69
| | | | binary constant
* Fixed the bug mdev-11574.Igor Babaev2017-10-064-8/+246
| | | | | Do not build an index merge of two indexes when one index is an infix of the other index.
* Windows MSI : dump server error log to MSI log on installation failure.Vladislav Vaintroub2017-10-031-1/+44
| | | | | | | | On failure, installer executes rollback actions, among them removing newly created data directory with all files in it. This patch makes installer at dump mariadb error log to installer log, before removing the files. This should make troubleshooting a little easier.
* Merge 5.5 into 10.0Marko Mäkelä2017-10-022-16/+12
|\
| * MDEV-13980 InnoDB fails to discard record lock when discarding an index pageMarko Mäkelä2017-10-022-10/+10
| | | | | | | | | | | | | | | | btr_cur_pessimistic_delete(): Discard a possible record lock also in the case when the record was the only one in the page. Failure to do this would corrupt the record lock data structures in a partial rollback (ROLLBACK TO SAVEPOINT or rolling back a row operation due to some error, such as a duplicate key in a unique secondary index).
| * MDEV-13137 MySQL 5.6.23 Crashes when SET GLOBAL server_audit_logging=OFF;Alexey Botchkov2017-09-191-2/+8
| | | | | | | | | | | | The MySQL 5.6 doesn't always send the MYSQL_AUDIT_GENERAL_LOG notification. So we have to suppress the log_current_query() in this case.
* | Cherry-pick the MDEV-13898 test changes from 10.2 to 10.0Marko Mäkelä2017-09-252-2/+14
| |
* | MDEV-13899 IMPORT TABLESPACE may corrupt ROW_FORMAT=REDUNDANT tablesMarko Mäkelä2017-09-242-16/+8
| | | | | | | | | | | | | | | | The ALTER TABLE…IMPORT TABLESPACE adjustment code that was introduced by WL#5522 in MySQL 5.6 is incorrectly invoking rec_get_status() on a ROW_FORMAT=REDUNDANT record to determine if a record is a leaf page record. The function rec_get_status(rec) is only to be called on ROW_FORMAT=COMPACT, DYNAMIC or COMPRESSED records.
* | Fix compile with -DWITHOUT_DYNAMIC_PLUGINS on UnixVladislav Vaintroub2017-09-232-11/+5
| |
* | MDEV-13814 Extra logging when innodb_log_archive=ONMarko Mäkelä2017-09-221-1/+1
| | | | | | | | | | | | | | log_group_read_log_seg(): Only display the message during recovery, not during normal operation. When the XtraDB configuration parameter innodb_log_archive is set, this function will be called during normal operation.
* | MDEV-13861 Assertion `0' failed in Protocol::end_statementSergei Golubchik2017-09-213-1/+18
| | | | | | | | | | followup for 378beed0a68 - only count WARN_LEVEL_ERROR, not warnings or notes.
* | CONNECT: compilation fixSergei Golubchik2017-09-211-1/+1
| | | | | | | | | | tabtyp was defined under ODBC_SUPPORT, but used outside of it too (under JDBC_SUPPORT).
* | Add have_debug.inc to skip the test faster in non-debug buildsMarko Mäkelä2017-09-211-0/+1
| |
* | cleanup: TABLE_LIST::view_check_optionSergei Golubchik2017-09-211-17/+20
| | | | | | | | | | don't prepare for checking view's CHECK OPTION, if there is no CHECK OPTION in the first place.
* | MDEV-12290 Wrong timestamps in binary log causes replication issuesSachin Setiya2017-09-211-1/+3
| | | | | | | | | | | | Binlog_background_thread does not make a call to set_time(), And when we call binlog_checkpoint_log_event->write() , we write the wrong timestamp. In this patch we correct this by calling thd->set_time().
* | MDEV-13290: Assertion Assertion `!is_set() || (m_status == DA_OK_BULK && ↵Sergei Golubchik2017-09-202-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | is_bulk_op())' or `! is_set()' failed followup for 97c2a7354b6 - don't use thd->is_error(), the error could've been set before TABLE_LIST::cleanup_items. Use the error handler to count errors. This fixes rpl.rpl_row_binlog_max_cache_size - it was failing when ER_STMT_CACHE_FULL happened duing multi-table update. Because multi_update::abort_result_set() calls do_updates() to update as much as possible, so one cannot rely on thd->is_error() after that.
* | include/master-slave.inc must always be included lastSergei Golubchik2017-09-2075-75/+75
| |
* | connect fixes after-mergeSergei Golubchik2017-09-204-5/+5
| | | | | | | | disable Mongo in 10.0, compiler warnings.
* | remove an empty file with a wrong nameSergei Golubchik2017-09-201-0/+0
| |
* | Merge branch 'bb-10.0-vicentiu' into 10.0Vicențiu Ciorbaru2017-09-20177-3620/+43050
|\ \
| * | Revert d9bc5e03d788b958ce8c76e157239953db60adb2 from Oracle (in XtraDB)Vicențiu Ciorbaru2017-09-193-33/+5
| | |
| * | Revert Bug #25175249 ASSERTION: (TEMPL->IS_VIRTUAL && !FIELD) || (FIELD && ↵Vicențiu Ciorbaru2017-09-191-20/+3
| | | | | | | | | | | | | | | | | | FIELD->PREFIX_LEN ? FIELD We don't want this in innodb/xtradb
| * | Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-09-198-35/+147
| |\ \
| | * | 5.6.37-82.2Vicențiu Ciorbaru2017-09-198-55/+179
| | | |
| * | | Merge branch 'merge-tokudb-5.6' into 10.0Vicențiu Ciorbaru2017-09-1910-366/+100
| |\ \ \
| | * | | 5.6.37-82.2Vicențiu Ciorbaru2017-09-1910-348/+100
| | | | |
| * | | | Fix fall-through warningVicențiu Ciorbaru2017-09-191-1/+1
| | | | |
| * | | | Fix connect merge problemsVicențiu Ciorbaru2017-09-194-51/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * CMakeLists.txt erroneous duplicated lines. * Unneded differences in tabjson.cpp * Unneded space differences in jdbconn.{cpp|h}
| * | | | Merge connect/10.0 into 10.0Vicențiu Ciorbaru2017-09-19149-3188/+42806
| | | | | | | | | | | | | | | | | | | | This is a squashed merge.
| * | | | Fix merge errorVicențiu Ciorbaru2017-09-191-2/+2
| | | | |
| * | | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-09-1910-26/+79
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge remote-tracking branch 'merge/merge-xtradb-5.5' into 5.5Vicențiu Ciorbaru2017-09-192-2/+2
| | |\ \ \
| | | * | | 5.5.57-38.9merge-xtradb-5.5Vicențiu Ciorbaru2017-09-192-2/+2
| | | | | |
| | * | | | Do not stop repeating a test even if some executions are skippedElena Stepanova2017-08-181-2/+1
| | | | | |
| | * | | | MDEV-11240: Server crashes in check_view_single_update or Assertion ↵Oleksandr Byelkin2017-08-163-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `derived->table' failed in mysql_derived_merge_for_insert Before "merge" view shoud be inited to maintaing transitive attributes like "multitable".
| | * | | | MTR's internal check of main.log_tables-big failedElena Stepanova2017-08-152-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test wasn't restoring log_output properly. Also added output of query_time in case of wrong result, to investigate the failure described in MDEV-13408
| | * | | | MDEV-13458: Wrong result for aggregate function with distinct clause when ↵Varun Gupta2017-08-094-5/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the value for tmp_table_size is small Fixed by making sure that the sort buffer would have atleast MERGEBUFF2 keys. Also fixed MDEV-13457 by making sure that an empty tree is never dumped to the disk
* | | | | | MDEV-13290: Assertion Assertion `!is_set() || (m_status == DA_OK_BULK && ↵Oleksandr Byelkin2017-09-193-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is_bulk_op())' or `! is_set()' failed Check error status which can be set by conversion procedures.
* | | | | | MDEV-13137 MySQL 5.6.23 Crashes when SET GLOBAL server_audit_logging=OFF;Alexey Botchkov2017-09-191-2/+8
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | The MySQL 5.6 doesn't always send the MYSQL_AUDIT_GENERAL_LOG notification. So we have to suppress the log_current_query() in this case.
* | | | | Windows : support vsjitdebugger in MTR's --debugger.Vladislav Vaintroub2017-09-151-1/+1
| | | | |
* | | | | Windows : fix a warning in popular header fileVladislav Vaintroub2017-09-152-2/+2
| | | | |
* | | | | MDEV-13685 Can not replay binary log due to Illegal mix of collations ↵Alexander Barkov2017-09-155-1/+84
| | | | | | | | | | | | | | | | | | | | (latin1_swedish_ci,IMPLICIT) and (utf8mb4_general_ci,COERCIBLE) for operation 'concat'
* | | | | Merge branch 'bb-10.0-wlad' into 10.0Vladislav Vaintroub2017-09-0913-119/+103
|\ \ \ \ \