summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update test results after the previous pushSergey Petrunya2014-02-254-8/+11
|
* MDEV-5244: Make extended_keys=ON by default in 10.0Sergey Petrunya2014-02-2518-45/+91
| | | | | | | | | - Change the default flag value to ON. - Update the testcases to be run extended_keys=ON: = trivial test result updates = If extended_keys setting makes a difference for a testcase, run the testcase with extended_keys=off. There were only a few such cases - Update to vcol_select_innodb looks like a worse plan but it will be gone in 10.0.
* Backport from 10.0 to 10.0-base the following:Sergey Petrunya2014-02-124-11/+113
| | | | | | | | | | | | revision-id: psergey@askmonty.org-20140204092710-2yt5ysa5ej3l2c03 MDEV-5606: range optimizer: "x < y" is sargable, while "y > x" is not Port to mariadb-1.0 the following fix from mysql-5.6: Revision ID: jorgen.loland@oracle.com-20120314131055-ml54x9deueqfsff4 BUG#13701206: WHERE A>=B DOES NOT GIVE SAME EXECUTION PLAN AS WHERE B<=A (RANGE OPTIMIZER) that fix didn't have a public testcase, so I created one.
* Fixed bug mdev-5630.Igor Babaev2014-02-114-0/+63
| | | | | | The function calculate_cond_selectivity_for_table() must consider the case when the key range tree returned by the call of get_mm_tree() is of the type SEL_TREE::ALWAYS.
* Fixed test case as gtid events are not counted anymoreMichael Widenius2014-02-112-11/+22
|
* Fixed wrong result fileMichael Widenius2014-02-111-1/+0
|
* MDEV-4937: sql_slave_skip_counter does not work with GTIDunknown2014-02-117-1/+45
| | | | | | | | | | | | | | As a side-effect of purge_relay_logs(), sql_slave_skip_counter was silently ignored in GTID mode. But sql_slave_skip_counter in fact is not a good match with GTID. And it is not really needed either, as users can explicitly set @@gtid_slave_pos to skip specific GTIDs, in a way that matches well how GTID replication works. So with this patch, we give an error on attempts to set sql_slave_skip_counter when using GTID, with a suggestion to use gtid_slave_pos instead, if needed.
* Fix check_testcase complaints due to missing SET debug_sync=RESET in a few ↵unknown2014-02-108-0/+12
| | | | tests.
* Merge of MDEV-4984, MDEV-4726, and MDEV-5636 into 10.0-base.unknown2014-02-1038-103/+1276
|\ | | | | | | | | | | | | MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID. MDEV-4726: Race in mysql-test/suite/rpl/t/rpl_gtid_stop_start.test MDEV-5636: Deadlock in RESET MASTER
| * MDEV-4726: Race in mysql-test/suite/rpl/t/rpl_gtid_stop_start.testunknown2014-02-092-4/+0
| | | | | | | | | | | | | | Fix a race in test case rpl_gtid_basic. include/sync_with_master_gtid.inc got confused due to two different GTIDs both with the same seq_no=9.
| * MDEV-5636: Deadlock in RESET MASTERunknown2014-02-092-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is a deadlock between MYSQL_BIN_LOG::reset_logs() and MYSQL_BIN_LOG::mark_xid_done(). The former takes LOCK_log and waits for the latter to complete. But the latter also tries to take LOCK_log; this can lead to a deadlock. There was already code that tries to deal with this, with the flag reset_master_pending. However, there was still a small opportunity for deadlock, when an previous mark_xid_done() is still running when reset_logs() is called and is at the precise point where it first releases LOCK_xid_list and then re-aquires both LOCK_log and LOCK_xid_list. Solve by setting reset_master_pending in reset_logs() before taking LOCK_log. And also count how many invocations of LOCK_xid_list are in the progress of releasing and re-aquiring locks, and in reset_logs() wait for that number to drop to zero after setting reset_master_pending and before taking LOCK_log.
| * MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.unknown2014-02-084-201/+246
| | | | | | | | | | | | | | | | Rewrite the gtid_waiting::wait_for_gtid() function. The code was rubbish (and buggy). Now the logic is much clearer. Also fix a missing slave sync that could cause test failure.
| * MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.unknown2014-02-085-12/+17
| | | | | | | | Couple of small fixes following buildbot testing.
| * MDEV-4726: Race in mysql-test/suite/rpl/t/rpl_gtid_stop_start.testunknown2014-02-0713-48/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | Some GTID test cases were using include/wait_condition.inc with a condition like SELECT COUNT(*)=4 FROM t1 to wait for the slave to catch up with the master. This causes races and test failures, as the changes to the tables become visible at the COMMIT of the SQL thread (or even before in case of MyISAM), but the changes to @@gtid_slave_pos only become visible a little bit after the COMMIT. Now that we have MASTER_GTID_WAIT(), just use that to sync up in a GTID-friendly way, wrapped in nice include/save_master_gtid.inc and include/sync_with_master_gtid.inc scripts.
| * MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.unknown2014-02-0726-39/+1084
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MASTER_GTID_WAIT() is similar to MASTER_POS_WAIT(), but works with a GTID position rather than an old-style filename/offset. @@LAST_GTID gives the GTID assigned to the last transaction written into the binlog. Together, the two can be used by applications to obtain the GTID of an update on the master, and then do a MASTER_GTID_WAIT() for that position on any read slave where it is important to get results that are caught up with the master at least to the point of the update. The implementation of MASTER_GTID_WAIT() is implemented in a way that tries to minimise the performance impact on the SQL threads, even in the presense of many waiters on single GTID positions (as from @@LAST_GTID).
* | MDEV-5509: Seconds_behind_master incorrect in parallel replicationunknown2014-01-087-13/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was a race between the SQL driver thread and the worker threads. The SQL driver thread would set rli->last_master_timestamp to zero to mark that it has caught up with the master, while the worker threads would set it to the timestamp of the executed event. This can happen out-of-order in parallel replication, causing the "caught up" status to be overwritten and Seconds_Behind_Master to wrongly grow when the slave is idle. To fix, introduce a separate flag rli->sql_thread_caught_up to mark that the SQL driver thread is caught up. This avoids issues with worker threads overwriting the SQL driver thread status. In parallel replication, we then make SHOW SLAVE STATUS check in addition that all worker threads are idle before showing Seconds_Behind_Master as 0 due to slave idle.
* | merge 5.5->10.0-baseunknown2014-02-054-1/+58
|\ \
| * | unix_socket fails in some build environments when $USER variableElena Stepanova2014-02-051-0/+13
| | | | | | | | | | | | | | | | | | appears to be unset, or when it contains 'root' even though the user does not have real root permissions
| * | Increment the version numberElena Stepanova2014-02-011-1/+1
| | |
| * | merge of MDEV-5369 (5.3->5.5)unknown2014-01-293-1/+45
| |\ \
| | * | MDEV-5369: Wrong result (0 instead of NULL) on 2nd execution of PS with LEFT ↵unknown2014-01-283-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | JOIN, TEMPTABLE view Set of JOIN_TYPE_OUTER made only once to avoid interference with optimization joins which made only once per query.
* | | | Upgrading the bundled PCRE to 8.34Alexander Barkov2014-02-03169-6706/+12146
| | | |
* | | | make sequence and sql_discovery suites default tooSergei Golubchik2014-02-012-0/+14
| | | |
* | | | 5.5 mergeSergei Golubchik2014-02-01304-940/+12471
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | 5.3 mergeSergei Golubchik2014-01-281-1/+1
| |\ \ | | |/
| | * 5.2 mergeSergei Golubchik2014-01-281-1/+1
| | |\
| | | * 5.1 mergeSergei Golubchik2014-01-284-16/+6
| | | |\
| | | | * fixed a client-side overflow in mysql cliSergei Golubchik2014-01-281-1/+1
| | | | |
| * | | | MDEV-5345 - Deadlock between mysql_change_user(), SHOW VARIABLES andSergey Vojtovich2014-01-284-79/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INSTALL PLUGIN There was mixed lock order between LOCK_plugin, LOCK_global_system_variables and LOCK_system_variables_hash. This patch ensures that write-lock on LOCK_system_variables_hash doesn't intersect with LOCK_plugin. Fixed by moving initialization/deinitialization of plugin options from plugin_add()/plugin_del() to plugin_initialize()/plugin_deinitalize(). So that plugin options are handled without protection of LOCK_plugin.
| * | | | merge 5.3 -> 5.5Alexander Barkov2014-01-286-10/+17
| |\ \ \ \ | | |/ / /
| | * | | MDEV-5506 safe_mutex: Trying to lock unitialized mutex at safemalloc.cAlexander Barkov2014-01-288-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on server shutdown after SELECT with CONVERT_TZ It's wrong to return my_empty_string from val_str(). Removing my_empty_string. Using make_empty_result() instead.
| * | | | MDEV-5576 ALTER TABLE progress report > 100%Sergei Golubchik2014-01-271-0/+1
| | | | |
| * | | | MDEV-4787 Missing dependency to "patch" for the Debian/Ubuntu "mariadb-test" ↵Sergei Golubchik2014-01-272-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | package add patch as a "suggested" dependency to mariadb-test-5.5
| * | | | MDEV-5405 RQG induced crash in mi_assign_to_key_cache in safe mutex unlockSergei Golubchik2014-01-273-10/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if two threads were calling mi_assign_to_key_cache() for the same table, one could change share->key_cache while the other was having share->key_cache->op_lock locked. The other thread would crash then, trying to unlock share->key_cache->op_lock (because it would be a different mutex). fixed by caching the value of share->key_cache in a local variable. The thread can still call flush_key_blocks() for an unassigned keycache, but it's harmless.
| * | | | mtr: check that tests clean up debug_sync. fix tests that didn't.Sergei Golubchik2014-01-2715-3/+17
| | | | |
| * | | | improve oqgraph boost check to filter out newer boost versionsSergei Golubchik2014-01-261-8/+26
| | | | |
| * | | | workaround test failures in buildbot:Sergei Golubchik2014-01-261-1/+2
| | | | | | | | | | | | | | | | | | | | in some VMs readline thinks that the window size is zero. ignore it.
| * | | | MDEV-5461 Assertion `length <= column->length' fails in write_block_record ↵Sergei Golubchik2014-01-263-30/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with functions in select list, GROUP BY, ORDER BY Old code in create_tmp_table(), that created an extra one-byte field (recinfo) before every NULL-able grouping field (Field) in the tmp table, did not actually work. Because the matching code in end_update(), that was supposed to update this byte, was using a wrong offset, updating the first byte of the Field, not a byte before it. Normally this wasn't an issue, because the Field value (written later in end_update) was overwriting this byte anyway. But in this bug the Field was Field_null, with zero length, so end_update() was overwriting the first byte of the following field. And the following field was not-nullable constant, which was stored only once in create_tmp_table and never updated later. Fixed by removing the code that didn't do any useful work anyway.
| * | | | move innodb specific test from group_by.test to group_by_innodb.testSergei Golubchik2014-01-264-53/+53
| | | | |
| * | | | fix the test for MDEV-5029 to clean up after itselfSergei Golubchik2014-01-261-0/+3
| | | | |
| * | | | Fix for MDEV-5168: MariaDB returns warnings for INSERT IGNOREMichael Widenius2014-01-269-6/+502
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added variable "OLD_MODE" that can be used to turn off the new behavior mysql-test/r/insert.result: Added test case mysql-test/r/mysqld--help.result: Added old_mode mysql-test/suite/sys_vars/r/old_mode_basic.result: Added testing of new variable mysql-test/suite/sys_vars/t/old_mode_basic.test: Added testing of new variable mysql-test/t/insert.test: Added test case sql/sql_class.h: Added bit flags for OLD_MODE sql/sql_insert.cc: Disable duplicate key warnings for INSERT IGNORE of OLD_MODE NO_DUP_KEY_WARNINGS_WITH_IGNORE is used sql/sql_show.cc: Don't show progress reporting on SHOW PROCESSLIST if OLD_MODE NO_PROGRESS_INFO is used sql/sys_vars.cc: Added OLD_MODE
| * | | | Fixed that setup_natural_join_row_types can safely be called twiceMichael Widenius2014-01-262-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item.h: Added cache for setup_natural_join_row_types sql/sql_base.cc: Cache old value of first_name_resolution_table for next call. (It's not safe to try to recalculate the value as the join structure may have been changed by the optimizer)
| * | | | Fixed bug that I accidently introduced in mysql_tzinfo_to_sqlMichael Widenius2014-01-263-3/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added test cases mysql-test/r/mysql_tzinfo_to_sql_symlink.result: Updated results mysql-test/std_data/zoneinfo/garbage: test file mysql-test/std_data/zoneinfo/ignored.tab: test file mysql-test/t/mysql_tzinfo_to_sql_symlink.test: Added test cases for all options sql/tztime.cc: Better error messages. Fixed wrong place for 'continue'
| * | | | speed up tokudb tests by adding begin/commit around insert loopsMichael Widenius2014-01-2646-0/+8510
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marked very long running tests as big_test
| * | | | Fixed MDEV-4970: Wrong result with Aria table populated with disabled keysMichael Widenius2014-01-254-4/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was that ALTER TABLE DISABLE KEYS incremented create_trid for the table, which made the new index entries invisible until the global trid catched up. Fixed by only updating create_trid if we are rewriting all rows and indexes. mysql-test/suite/maria/alter.result: Added test case mysql-test/suite/maria/alter.test: Added test case storage/maria/ha_maria.cc: Only updating create_trid if we are doing a full repair (and thus rewriting all rows and indexes). storage/maria/trnman.c: More DBUG_PRINT
| * | | | Merge 5.3 -> 5.5Alexander Barkov2014-01-278-25/+64
| |\ \ \ \ | | |/ / /
| | * | | MDEV-5458 RQG hits 'sql/tztime.cc:799: my_time_t sec_since_epoch(...):Alexander Barkov2014-01-278-25/+63
| | | | | | | | | | | | | | | | | | | | | | | | | Assertion `mon > 0 && mon < 13' failed.'
| * | | | Merge 5.3 -> 5.5Alexander Barkov2014-01-275-0/+75
| |\ \ \ \ | | |/ / /
| | * | | [Backport to 5.3]Sergey Petrunya2014-01-253-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-5337: Wrong result in mariadb 5.5.32 with ORDER BY + LIMIT when index_condition_pushdown=on - in test_if_skip_sort_order(), correct the condition under which we have the code that restores the previously pushed index condition.
| | * | | MDEV-5504 Server crashes in String::length on SELECT with MONTHNAME, GROUP ↵Alexander Barkov2014-01-244-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BY, ROLLUP The crash happened because Item_func_monthname was derived from Item_func_month, so Item_func_monthname::is_null() did not work fine. Backporting a change from 5.5: Item_func_monthname is now derived from Item_str_func.