summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Galera test case cleanups.bb-10.1-MDEV-15436Jan Lindström2018-09-059-487/+14
|
* MDEV-15436: If log_bin and log_bin_index is different SST with rsync fails.Jan Lindström2018-09-059-11/+459
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was that in SST log_bin_index name and directory was not handled and passed to rsync SST script. wsrep_sst_common.sh Read binlog index dirname and filename if --binlog-index parameter is provided. Read binlog filenames from that file from donor and write transfered binlog filenames to that file in joiner. mysqld.cc, mysqld.h Moved opt_binlog_index_name from static to global and added it to extern. wsrep_sst.cc generate_binlog_index_opt_val New function to generate binlog index name if opt_binlog_index_name is given on configuration. sst_prepare_other Add binlog index configuration to SST command. wsrep_sst.h Add new SST parameter --binlog-index Add test case.
* Add MDEV-11080, MDEV-16709 tests for the MDEV-13333 fixMarko Mäkelä2018-09-042-17/+86
| | | | | | | | | The regression that was introduced in commit 723f87e9d318aedad30dfb9dde104312d6612662 was fixed as part of MDEV-13333 (commit 3b37edee1a5121e9523fa8a7f483185f402905e2) without a test case, because the MDEV-13333 test case is even less deterministic than these ones.
* fix failures of innodb_plugin tests in --embeddedSergei Golubchik2018-09-047-4/+14
| | | | | | Post-fix for 7e8ed15b95b Also, apply the same innodb fix to xtradb.
* MDEV-15792 Fix mtr to be able to wait for >1 exited mysqldSergei Golubchik2018-09-041-10/+6
| | | | | | | Post-merge fixes: minor perlification and get rid of an annoying run-time warning (undef value in string comparison) Closes #709
* MDEV-15792 Fix mtr to be able to wait for >1 exited mysqldVasil Dimov2018-09-041-96/+103
| | | | | | | | | | | | | | If a mtr test case has started two mysqld processes (replication tests), then kills the first one and kills the second one before starting the first (so at some point there are two mysqlds down), then the ./mtr waiting process bricks and forgets to monitor the "expect" file of the first mysqld, so it never gets started again, even when its contents is changed to "restart". A victim of this deficiency is at least galera.galera_gcache_recover. The fix is to keep a list of all mysqlds we should wait to start, not just one (the last one killed).
* run binlog.binlog_stm_binlog test in non-debug buildsSergei Golubchik2018-09-041-1/+0
|
* compiler warnings (clang 4.0.1 on i386)Sergei Golubchik2018-09-0425-37/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/mariabackup/fil_cur.cc:361:42: warning: format specifies type 'unsigned long' but the argument has type 'ib_int64_t' (aka 'long long') [-Wformat] extra/mariabackup/fil_cur.cc:376:9: warning: format specifies type 'unsigned long' but the argument has type 'ib_int64_t' (aka 'long long') [-Wformat] sql/handler.cc:6196:45: warning: format specifies type 'unsigned long' but the argument has type 'wsrep_trx_id_t' (aka 'unsigned long long') [-Wformat] sql/log.cc:1681:16: warning: format specifies type 'unsigned long' but the argument has type 'size_t' (aka 'unsigned int') [-Wformat] sql/log.cc:1687:16: warning: format specifies type 'unsigned long' but the argument has type 'size_t' (aka 'unsigned int') [-Wformat] sql/wsrep_sst.cc:1388:86: warning: format specifies type 'long' but the argument has type 'wsrep_seqno_t' (aka 'long long') [-Wformat] sql/wsrep_sst.cc:232:86: warning: format specifies type 'long' but the argument has type 'wsrep_seqno_t' (aka 'long long') [-Wformat] storage/connect/filamdbf.cpp:450:47: warning: format specifies type 'short' but the argument has type 'int' [-Wformat] storage/connect/filamdbf.cpp:970:47: warning: format specifies type 'short' but the argument has type 'int' [-Wformat] storage/connect/inihandl.cpp:197:16: warning: address of array 'key->name' will always evaluate to 'true' [-Wpointer-bool-conversion] storage/innobase/btr/btr0scrub.cc:151:17: warning: format specifies type 'long' but the argument has type 'int' [-Wformat] storage/innobase/buf/buf0buf.cc:5085:8: warning: nonnull parameter 'bpage' will evaluate to 'true' on first encounter [-Wpointer-bool-conversion] storage/innobase/fil/fil0crypt.cc:2454:5: warning: format specifies type 'long' but the argument has type 'int' [-Wformat] storage/innobase/handler/ha_innodb.cc:18685:7: warning: format specifies type 'unsigned long' but the argument has type 'wsrep_trx_id_t' (aka 'unsigned long long') [-Wformat] storage/innobase/row/row0mysql.cc:3319:5: warning: format specifies type 'long' but the argument has type 'int' [-Wformat] storage/innobase/row/row0mysql.cc:3327:5: warning: format specifies type 'long' but the argument has type 'int' [-Wformat] storage/maria/ma_norec.c:35:10: warning: implicit conversion from 'int' to 'my_bool' (aka 'char') changes value from 131 to -125 [-Wconstant-conversion] storage/maria/ma_norec.c:42:10: warning: implicit conversion from 'int' to 'my_bool' (aka 'char') changes value from 131 to -125 [-Wconstant-conversion] storage/maria/ma_test2.c:1009:12: warning: format specifies type 'unsigned long' but the argument has type 'size_t' (aka 'unsigned int') [-Wformat] storage/maria/ma_test2.c:1010:12: warning: format specifies type 'unsigned long' but the argument has type 'size_t' (aka 'unsigned int') [-Wformat] storage/mroonga/ha_mroonga.cpp:9189:44: warning: use of logical '&&' with constant operand [-Wconstant-logical-operand] storage/mroonga/vendor/groonga/lib/expr.c:4987:22: warning: comparison of constant -1 with expression of type 'grn_operator' is always false [-Wtautological-constant-out-of-range-compare] storage/xtradb/btr/btr0scrub.cc:151:17: warning: format specifies type 'long' but the argument has type 'int' [-Wformat] storage/xtradb/buf/buf0buf.cc:5047:8: warning: nonnull parameter 'bpage' will evaluate to 'true' on first encounter [-Wpointer-bool-conversion] storage/xtradb/fil/fil0crypt.cc:2454:5: warning: format specifies type 'long' but the argument has type 'int' [-Wformat] storage/xtradb/row/row0mysql.cc:3324:5: warning: format specifies type 'long' but the argument has type 'int' [-Wformat] storage/xtradb/row/row0mysql.cc:3332:5: warning: format specifies type 'long' but the argument has type 'int' [-Wformat] unittest/sql/mf_iocache-t.cc:120:35: warning: format specifies type 'unsigned long' but the argument has type 'int' [-Wformat] unittest/sql/mf_iocache-t.cc:96:35: note: expanded from macro 'INFO_TAIL'
* MDEV-9627 clang builds fail on i386Sergei Golubchik2018-09-041-1/+1
| | | | don't use C11 atomics unless HAVE_GCC_C11_ATOMICS is defined
* Fix TokuDB's check for -Wno-address-of-packed-memberSergei Golubchik2018-09-041-4/+1
| | | | (failed configure with old clang)
* Merge pull request #859 from grooverdan/10.1-galera_new_cluster-unsed-varsJan Lindström2018-09-031-3/+0
|\ | | | | galera_new_cluster.sh: unused variables
| * galera_new_cluster.sh: unused variablesDaniel Black2018-09-031-3/+0
|/
* MDEV-15890 Strange error message if you try to FLUSH TABLES <view> after ↵Alexey Botchkov2018-09-028-61/+159
| | | | | | | LOCK TABLES <view>. Check if the argument of the FLUSH TABLE is a VIEW and handle it accordingly.
* Disable failing Galera tests.Jan Lindström2018-08-311-0/+2
|
* MDEV-16647 InnoDB fails to drop large temporary table on disconnectMarko Mäkelä2018-08-312-2/+4
| | | | | | | | | | | | | | | | This regression was introduced in MDEV-16515. We would fail to drop a temporary table on client disconnect, because trx_is_interrupted() would hold. To add insult to injury, in MariaDB 10.1, InnoDB temporary tables are actually persistent, so the garbage temporary tables will never be dropped. row_drop_table_for_mysql(): If several iterations of buf_LRU_drop_page_hash_for_tablespace() are needed, do not interrupt dropping a temporary table even after the transaction was marked as killed. Server shutdown will still terminate the loop, and also DROP TABLE of persistent tables will keep checking if the execution was aborted.
* Revert MDEV-9519 due to regressionsMarko Mäkelä2018-08-3111-677/+30
| | | | This reverts commit 75dfd4acb995789ca5f86ccbd361fff9d2797e79.
* MDEV-16665 ed25519 describes itself as 1.0-alpha even though it's not alpha.Alexey Botchkov2018-08-302-2/+2
| | | | Plugin version name fixed.
* MDEV-17095 pam_user_map module throws syntax error if group name contains ↵Alexey Botchkov2018-08-301-2/+4
| | | | | | backslash. Let '\\' and '/' symbols to be part of a group name.
* MDEV-15512 - Fix sh parse error when [sst] config value has spaces.Jan Lindström2018-08-291-2/+2
| | | | | Merged https://github.com/MariaDB/server/pull/617 authored by Colin Mollenhour.
* MDEV-14927: Missing man pagesIan Gilfillan2018-08-288-5/+72
|
* Merge pull request #539 from ↵Jan Lindström2018-08-281-2/+1
|\ | | | | | | | | grooverdan/10.1-wsrep_sst_rsync_read_MYSQL_BASE_VERSION_config MDEV-14851: galera_recovery to read correct configuration file sections
| * Merge branch '10.1' into 10.1-wsrep_sst_rsync_read_MYSQL_BASE_VERSION_configDaniel Black2018-02-04526-4124/+10474
| |\
| * | galera_recovery: misses reading default configuration groupsDaniel Black2018-01-131-2/+1
| | |
| * | wsrep_sst_rsync: read correct configuration sectionsDaniel Black2018-01-131-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | 4bb49d84a9df had a single option, --mysqld to obtain the required innodb_log_group_home_dir. 83664e21e4fb675 enumberated the groups when --mysqld was sufficient.
* | | MDEV-15797 Assertion `thd->killed != 0' failed in ha_maria::enable_indexesMonty2018-08-278-6/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was that a parallel open of a table, overwrote info->state that was in used by repair. Fixed by changing _ma_tmp_disable_logging_for_table() to use a new state buffer state.no_logging to store the temporary state. Other things: - Use original number of rows when retrying repair to get rid of a potential warning "Number of rows changed from X to Y" - Changed maria_commit() to make it easier to merge with 10.4 - If table is not locked (like with show commands), use the global number of rows as the local number may not be up to date. (Minor not critical fix) - Added some missing DBUG_RETURN
* | | Merge pull request #828 from tempesta-tech/sysprg/10.1-MDEV-10754Jan Lindström2018-08-218-1/+379
|\ \ \ | | | | | | | | MDEV-10754 wsrep_sst_rsync does not support innodb_data_home_dir
| * | | Fixes of the base patch for compatibility with the 10.1 branchJulius Goryavsky2018-08-172-27/+1
| | | |
| * | | Reverting changes made to support the mtr under the rootJulius Goryavsky2018-08-132-11/+0
| | | |
| * | | Fixes after review and correction of the problems caused by the fact that ↵Julius Goryavsky2018-08-098-7/+99
| | | | | | | | | | | | | | | | during the SST innodb plugin is not yet initialized, as well as problems with running tests from the root user (not directly related to the MDEV-10754).
| * | | Merge branch '10.1' of https://github.com/MariaDB/server into ↵Julius Goryavsky2018-08-08166-1151/+3176
| |\ \ \ | | | | | | | | | | | | | | | sysprg/10.1-MDEV-10754
| * | | | MDEV-10754 wsrep_sst_rsync does not support innodb_data_home_dirJulius Goryavsky2018-07-264-1/+324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If innodb_data_home_dir path specified in the configuration file then rsync IST/SST will fail because the wsrep_sst_rsync.sh script does not read this parameter from the configuration file and then tries to find the data files in the default directory. To fix this error, we need to add reading of the innodb_data_home_dir configuration parameter to the rsync-related SST script.
* | | | | MDEV-17026 Assertion srv_undo_sources || ... failed on slow shutdownMarko Mäkelä2018-08-212-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trx_purge_add_update_undo_to_history(): Relax the too strict assertion by removing the condition on srv_fast_shutdown (innodb_fast_shutdown). Rollback is allowed during any form of shutdown.
* | | | | MDEV-17003 service_manager_extend_timeout() being called too oftenMarko Mäkelä2018-08-216-22/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buf_dump(): Only generate the output when shutdown is in progress. log_write_up_to(): Only generate the output before actually writing to the redo log files. srv_purge_should_exit(): Rate-limit the output, and instead of displaying the work done, indicate the work that remains to be done until the completion of the slow shutdown.
* | | | | Merge branch '10.0' into 10.1Oleksandr Byelkin2018-08-2119-27/+169
|\ \ \ \ \
| * \ \ \ \ Merge branch '5.5' into 10.0Oleksandr Byelkin2018-08-1519-30/+122
| |\ \ \ \ \
| | * | | | | MDEV-15475: Assertion `!table || (!table->read_set || ↵Oleksandr Byelkin2018-08-1510-12/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bitmap_is_set(table->read_set, field_index))' failed on EXPLAIN EXTENDED with constant table and view Print constant ISNULL value independent. Fix of printing of view FRM and CREATE VIEW output
| | * | | | | MDEV-16963 Tighten named pipe access controlVladislav Vaintroub2018-08-131-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use real DACL instead of NULL DACL. Grant Everyone just read/write access to pipe (instead of all access like previously with NULL ACL)
| | * | | | | MDEV-16810 AddressSanitizer: stack-buffer-overflow in int10_to_strSergei Golubchik2018-08-114-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | truncate incorrect values in convert_period_to_month() so that PERIOD_DIFF never returns a value outside of 2^23 range. And, for safety, increase buffer sizes for int10_to_str to be sufficienly big for any int10_to_str result.
| | * | | | | MDEV-16904 inline void swap(base_list &rhs) should swap list only when list ↵Sachin2018-08-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is... not empty We should swap the list only when list is not empty.
| | * | | | | Update rulesRasmus Johansson2018-08-061-1/+4
| | | | | | |
| | * | | | | MDEV-16166 RBR breaks with HA_ERR_KEY_NOT_FOUND upon DELETE from table...sachin2018-08-043-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with spatial index So the issue is since it is spatial index , at the time of searching index for key (Rows_log_event::find_row) we use wrong field image we use Field::itRAW while we should be using Field::itMBR
| | * | | | | bump the VERSIONDaniel Bartholomew2018-07-311-1/+1
| | | | | | |
| * | | | | | MDEV-6439: Server crashes in Explain_union::print_explain with explain in ↵Sergei Petrunia2018-08-153-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slow log, tis620 charset Item_subselect::is_expensive() used to return FALSE (Inexpensive) whenever it saw that one of SELECTs in the Subquery's UNION is degenerate. It ignored the fact that other parts of the UNION might not be inexpensive, including the case where pther parts of the UNION have no query plan yet. For a subquery in form col >= ANY (SELECT 'foo' UNION SELECT 'bar') this would cause the query to be considered inexpensive when there is no query plan for the second part of the UNION, which in turn would cause the SELECT 'foo' to compute and free itself while still inside JOIN::optimize for that SELECT (See MDEV comment for full description).
* | | | | | | This is patch for the https://jira.mariadb.org/browse/MDEV-9519 issue:Julius Goryavsky2018-08-1511-30/+677
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have a 2+ node cluster which is replicating from an async master and the binlog_format is set to STATEMENT and multi-row inserts are executed on a table with an auto_increment column such that values are automatically generated by MySQL, then the server node generates wrong auto_increment values, which are different from what was generated on the async master. The causes and fixes: 1. We need to improve processing of changing the auto-increment values after changing the cluster size. 2. If wsrep auto_increment_control switched on during operation of the node, then we should immediately update the auto_increment_increment and auto_increment_offset global variables, without waiting of the next invocation of the wsrep_view_handler_cb() callback. In the current version these variables retain its initial values if wsrep_auto_increment_control is switched on during operation of the node, which leads to inconsistent results on the different nodes in some scenarios. 3. If wsrep auto_increment_control switched off during operation of the node, then we must return the original values of the auto_increment_increment and auto_increment_offset global variables, as the user has set. To make this possible, we need to add a "shadow copies" of these variables (which stores the latest values set by the user).
* | | | | | | Merge pull request #844 from codership/10.1-MDEV-15933Jan Lindström2018-08-153-6/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | MDEV-15933 Cannot resume Node SYNCED state when wsrep_desync is done after FTWRL
| * | | | | | | MDEV-15933 Cannot resume Node SYNCED state when wsrep_desync is done after FTWRLmkaruza2018-08-143-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually setting wsrep_desync after FTWRL should not be allowed.
* | | | | | | | MDEV-16220 Do not pass UTF8 to mysql in command line parameters, on WindowsVladislav Vaintroub2018-08-144-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved parts of mysql.test to mysql_not_windows.test
* | | | | | | | MDEV-15869 Mariabackup is lacking some dependencies declaration (#771)faust2018-08-091-1/+3
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Backport from 10.4 to resolve dependency problem Using the dependency syntax from 10.4 branch because {$LIBSSL} can not be used.
* | | | | | | bump the VERSIONDaniel Bartholomew2018-08-071-1/+1
| | | | | | |
* | | | | | | MDEV-13333: Deadlock failure that does not occur elsewhereJan Lindström2018-08-062-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InnoDB executed code that is mean to execute only when Galera is used and in bad luck one of the transactions is selected incorrectly as deadlock victim. Fixed by adding wsrep_on_trx() condition before entering actual Galera transaction handling. No always repeatable test case for this issue is known.