summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updated list of unstable tests for 10.1.27 releasemariadb-10.1.27Elena Stepanova2017-09-221-67/+107
|
* update rdiff after mergeSergei Golubchik2017-09-221-1/+1
|
* Merge 10.0 into 10.1Marko Mäkelä2017-09-221-1/+1
|\
| * 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.
* | bugfix: copy timestamps correctly in INSERT...SELECTSergei Golubchik2017-09-215-7/+69
| | | | | | | | | | don't do it via MYSQL_TIME, that conversion is lossy around DST change dates.
* | MDEV-12672 Replicated TIMESTAMP fields given wrong value near DST changeSergei Golubchik2017-09-215-1/+120
| | | | | | | | | | | | Implement a special Copy_field method for timestamps, that copies timestamps without converting them to MYSQL_TIME (the conversion is lossy around DST change dates).
* | MDEV-13208 Cannot import libmariadbclient.so.18 from pythonSergei Golubchik2017-09-212-0/+13
| | | | | | | | libmariadbclient_18 version nodes, specially for debian builds
* | Merge branch '10.0' into 10.1Sergei Golubchik2017-09-2187-95/+144
|\ \ | |/
| * 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
| |
* | MDEV-10767 /tmp/wsrep_recovery.${RANDOM} file created in unallowed SELinux ↵sachin2017-09-212-4/+4
| | | | | | | | | | | | | | | | | | | | | | context Problem:- To create file in /tmp dir mysqld require permission initrc_tmp_t. And mysqld does not have his permission. Solution:- Instead of giving mysqld permission of initrc_tmp_t , we redirected log to file in /tmp dir through shell. I also removed a earlier workarround in mysqld_safe.sh , which create tmp log file in datadir.
* | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-203-0/+60
|\ \ | |/
| * Merge branch 'bb-10.0-vicentiu' into 10.0Vicențiu Ciorbaru2017-09-20177-3620/+43050
| |\
| * | 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.
* | | Merge branch 'bb-10.1-vicentiu' into 10.1Vicențiu Ciorbaru2017-09-20194-3009/+43238
|\ \ \
| * \ \ Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-19193-3008/+43237
| |\ \ \ | | | |/ | | |/|
| | * | 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
| | * | | | | 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
| | |\ \ \ \ \
| | | * | | | | Build improvements and cleanups.Vladislav Vaintroub2017-09-0813-119/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - the probably ultimate fix for dependencies on VS - remove some GET_TARGET_PROPERTY(LOCATION ...), they are deprecated in cmake 3.9 - simplify signing targets on Windows. - remove INSTALL_DEBUG_TARGET, we do not mix binaries from different builds in the same package
| * | | | | | | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2017-09-191-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix test failures on embedded server.Jan Lindström2017-08-319-31/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was incorrect definition of wsrep_recovery, trx_sys_update_wsrep_checkpoint and trx_sys_read_wsrep_checkpoint functions causing innodb_plugin not to load as there was undefined symbols.
* | | | | | | | | MDEV-13850: Uninitialized variable at wsrep_binlog.cc:455Jan Lindström2017-09-201-1/+1
| | | | | | | | |
* | | | | | | | | 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.