summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update FSF addressVicențiu Ciorbaru2019-05-11719-725/+725
|
* Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-11371-380/+380
|\
| * Follow-up to changing FSF addressVicențiu Ciorbaru2019-05-11165-167/+167
| | | | | | | | | | | | | | | | | | | | Some places didn't match the previous rules, making the Floor address wrong. Additional sed rules: sed -i -e 's/Place.*Suite .*, Boston/Street, Fifth Floor, Boston/g' sed -i -e 's/Suite .*, Boston/Fifth Floor, Boston/g'
| * Update FSF addressMichal Schorm2019-05-10217-227/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is based on the work of Michal Schorm, rebased on the earliest MariaDB version. Th command line used to generate this diff was: find ./ -type f \ -exec sed -i -e 's/Foundation, Inc., 59 Temple Place, Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \ -exec sed -i -e 's/Foundation, Inc. 59 Temple Place.* Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \ -exec sed -i -e 's/MA.*.....-1307.*USA/MA 02110-1335 USA/g' {} \; \ -exec sed -i -e 's/Foundation, Inc., 59 Temple/Foundation, Inc., 51 Franklin/g' {} \; \ -exec sed -i -e 's/Place, Suite 330, Boston, MA.*02111-1307.*USA/Street, Fifth Floor, Boston, MA 02110-1335 USA/g' {} \; \ -exec sed -i -e 's/MA.*.....-1307/MA 02110-1335/g' {} \;
* | MDEV-13893 encryption.innodb-redo-badkey failed in buildbot with page cannot ↵Thirunarayanan Balathandayuthapani2019-05-102-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | be decrypted buf_dblwr_process(): Remove the useless warning that a copy of a page in the doublewrite buffer is corrupted. We already report an error if a corrupted page cannot be recovered from the doublewrite buffer. Note: In MariaDB 10.1, the original bug reported in MDEV-13893 could still be easily repeatable. In MariaDB 10.2.24, MDEV-12699 should have reduced the probability considerably.
* | MDEV-18220: race condition in fts_get_table_name()Marko Mäkelä2019-05-108-34/+66
| | | | | | | | fts_get_table_name(): Add the parameter bool dict_locked=false.
* | MDEV-18220: Backport some code from MariaDB 10.2Marko Mäkelä2019-05-1014-536/+612
| | | | | | | | | | | | | | | | | | | | fts_get_table_name(): Output to a caller-allocated buffer. fts_get_table_name_prefix(): Use the lower-overhead allocation ut_malloc() instead of mem_alloc(). This is based on mysql/mysql-server@d1584b9f38ff0bcf609d181db35f74108e022168 in MySQL 5.7.4.
* | MDEV-18220: heap-use-after-free in fts_get_table_name_prefix()Marko Mäkelä2019-05-1016-74/+28
| | | | | | | | | | | | | | | | | | | | | | | | fts_table_t::parent: Remove the redundant field. Refer to table->name.m_name instead. fts_update_sync_doc_id(), fts_update_next_doc_id(): Remove the redundant parameter table_name. fts_get_table_name_prefix(): Access the dict_table_t::name. FIXME: Ensure that this access is always covered by dict_sys->mutex.
* | MDEV-18220: Remove some redundant data structuresMarko Mäkelä2019-05-106-326/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fts_state_t, fts_slot_t::state: Remove. Replaced by fts_slot_t::running and fts_slot_t::table_id as follows. FTS_STATE_SUSPENDED: Removed (unused). FTS_STATE_EMPTY: Removed. table_id=0 will denote empty slots. FTS_STATE_RUNNING: Equivalent to running=true. FTS_STATE_LOADED, FTS_STATE_DONE: Equivalent to running=false. fts_slot_t::table: Remove. Tables will be identified by table_id. After opening a table, we will check fil_table_accessible() before accessing the data. fts_optimize_new_table(), fts_optimize_del_table(), fts_optimize_how_many(), fts_is_sync_needed(): Remove the parameter tables, and use the static variable fts_slots (which was introduced in MariaDB 10.2) instead.
* | MDEV-19399 do not call slow my_timer_init() several timesEugene Kosov2019-05-108-56/+54
| | | | | | | | | | | | | | | | | | | | | | No functional change. Call my_timer_init() only once and then reuse it from InnoDB and perfschema storage engines. This patch speeds up empty test for me like this: ./mtr -mem innodb.kevg,xtradb 1.21s user 0.84s system 34% cpu 5.999 total ./mtr -mem innodb.kevg,xtradb 1.12s user 0.60s system 31% cpu 5.385 total
* | MDEV-19427 mysql_upgrade_service throws exception upgrading from 10.0 to 10.3Vladislav Vaintroub2019-05-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The crash happens when writing into log file. The reason is likely that the call to WriteFile() was missing a valid parameter for lpNumberOfBytesWritten. This seems only to happen on ancient version of Windows. Since the fix to MDEV-16430 in 141bc58ac992, null pointer was passed instead of valid pointer. The fix is to provide a valid lpNumberOfBytesWritten parameter.
* | Removed dead codeSergey Vojtovich2019-05-091-57/+0
| |
* | MDEV-16060 - InnoDB: Failing assertion: ut_strcmp(index->name, key->name)Sergey Vojtovich2019-05-095-46/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | A sequel to 9180e86 and 149b754. ALTER TABLE ... ADD FOREIGN KEY may crash if parent table is updated concurrently. Block FK parent table updates even earlier, before intermediate child table is created. Use proper charset info for my_casedn_str() and don't update original identifiers so that lower_cast_table_names == 2 is honoured.
* | bump the VERSIONDaniel Bartholomew2019-05-081-1/+1
| |
* | Null merge mariadb-10.1.40 into 10.1Marko Mäkelä2019-05-080-0/+0
|\ \
| * | bump the VERSIONmariadb-10.1.40Daniel Bartholomew2019-05-071-1/+1
| | |
| * | MDEV-17640 UMASK_DIR configuration for mysql_install_db is not applied to ↵Sergei Golubchik2019-05-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | mysql database regression after 3db6de33b2b in RPMs continue creating the $datadir outside of mysql_install_db. RPMs put the socket in there, so it cannot be chmod 0700.
* | | MDEV-19387 innodb_ft_result_cache_limit_32 fails on s390xThirunarayanan Balathandayuthapani2019-05-085-17/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: ==== 1) Combined innodb_ft_result_cache_limit_32.test and innodb_ft_result_cache_limit_64.test test case in sys_vars suite. 2) Use word_size.inc for combinations of innodb_ft_result_cache_limit test case.
* | | MDEV-19405: Galera test failure on galera_parallel_autoinc_largetrxbb-10.1-MDEV-19405Jan Lindström2019-05-074-49/+98
| | | | | | | | | | | | | | | Test case was not stable. Fixed also galera_parallel_autoinc_manytrx as it has the same problem.
* | | Revert "MDEV-19399 do not call slow my_timer_init() several times"Marko Mäkelä2019-05-065-49/+55
| | | | | | | | | | | | | | | | | | | | | This reverts commit 8dc670a5e8d322d8e1871b8c2ae8695a8779f739. The symbol sys_timer_info was not being exported correctly, which caused linking failures on some platforms.
* | | MDEV-17640 UMASK_DIR configuration for mysql_install_db is not applied to ↵Sergei Golubchik2019-05-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | mysql database regression after 3db6de33b2b in RPMs continue creating the $datadir outside of mysql_install_db. RPMs put the socket in there, so it cannot be chmod 0700.
* | | MDEV-18214 remove some duplicated MONITOR countersEugene Kosov2019-05-065-51/+53
| | | | | | | | | | | | | | | | | | | | | MONITOR_PENDING_LOG_WRITE MONITOR_PENDING_CHECKPOINT_WRITE MONITOR_LOG_IO: read values from log_t members instead of updating own monitor variables
* | | MDEV-19399 do not call slow my_timer_init() several timesEugene Kosov2019-05-065-55/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No functional change. Call my_timer_init() only once and then reuse it from InnoDB and perfschema storage engines. This patch speeds up empty test for me like this: ./mtr -mem innodb.kevg,xtradb 1.21s user 0.84s system 34% cpu 5.999 total ./mtr -mem innodb.kevg,xtradb 1.12s user 0.60s system 31% cpu 5.385 total
* | | MDEV-17883: CREATE TABLE IF NOT EXISTS locking changes in 10.3.10Jan Lindström2019-05-031-4/+5
| | | | | | | | | | | | | | | Based on pull request https://github.com/MariaDB/server/pull/999 by mkaruza@galeracluster.com
* | | Merge branch '5.5' into 10.1Oleksandr Byelkin2019-05-022-2/+10
|\ \ \ | | |/ | |/|
| * | MDEV-19349 mysql_install_db: segfault at tmp_file_prefix checkAleksey Midenkov2019-05-012-7/+10
| | |
| * | bump the VERSIONDaniel Bartholomew2019-04-291-1/+1
| | |
* | | bump the VERSIONDaniel Bartholomew2019-05-021-1/+1
| | |
* | | MDEV-19352: Server crash in alloc_histograms_for_table_share upon query from ↵Varun Gupta2019-05-024-2/+60
| | | | | | | | | | | | | | | | | | | | | information schema To read histograms for a table, we should check if the allocation of statistics was done or not, if not done we should not try to read histograms for such a table.
* | | Adjusting sql_command to align with higher version, this is an adjustmentVarun Gupta2019-05-021-5/+4
| |/ |/| | | | | to the patch for MDEV-17605
* | Updated list of unstable tests for 10.1.39 releasemariadb-10.1.39Elena Stepanova2019-04-301-61/+122
| |
* | MDEV-14572: Assertion `! is_set()' failed in ↵Oleksandr Byelkin2019-04-303-0/+43
| | | | | | | | | | | | | | | | | | Diagnostics_area::set_eof_status upon EXPLAIN UPDATE in PS Restore EXPAIN flag in SELECT_LEX before execution multi-update by flag in LEX (the same but in other way made before INSERT/DELETE/SELECT) Without it, mysql_update() didn't know that there will be EXPLAIN result set and was sending OK at the end of the update, which conflicted with the EOF sent later by EXPLAIN.
* | MDEV-19243 Fix timezone handling on Windows to report standard timezone namesVladislav Vaintroub2019-04-303-13/+183
| |
* | Tests for MDEV-19359 ASAN heap-use-after-free in copy_if_not_alloced / ↵Alexander Barkov2019-04-302-0/+21
| | | | | | | | | | | | make_sortkey The patch for MDEV-18738 fixed this problem. Adding tests only.
* | MDEV-18738 ASAN heap-use-after-free in copy_if_not_alloced / copy_fieldsAlexander Barkov2019-04-303-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | copy_if_not_alloced() did not handle situations when "from" is a constant string pointing to a substring of "to", so this code part freed "to" but then tried to copy its old (already freed) content to a new buffer: if (to->realloc(from_length)) return from; if ((to->str_length=MY_MIN(from->str_length,from_length))) memcpy(to->Ptr,from->Ptr,to->str_length); Adding a new code piece that catches such constant substrings and propery reallocs "to" to preserve its important part referenced by "from".
* | Tests for MDEV-11895 NO_ZERO_DATE affects timestamp values without any warningsAlexander Barkov2019-04-292-0/+64
| | | | | | | | | | This problem was earlier fixed, possibly by f8a800bec81983910a96a5dc38f3aeb9b7528bce and is not repeatable in 10.1-10.4 any more. Adding tests only.
* | MDEV-19265 Server should throw warning if event is created and ↵Vladislav Vaintroub2019-04-2836-4/+289
| | | | | | | | event_scheduler = OFF
* | MDEV-19276 during connect, write error log warning for ER_DBACCESS_DENIED_ERROR,Vladislav Vaintroub2019-04-285-18/+60
| | | | | | | | | | | | | | if log_warnings > 1. This makes ER_DBACCESS_DENIED_ERROR handling the same as we do for other "access denied"
* | MDEV-19262 Server error message is unclear if event is created and ↵Vladislav Vaintroub2019-04-282-12/+12
| | | | | | | | | | | | event_scheduler = DISABLED Change error message.
* | MDEV-18131 MariaDB does not verify IP addresses from subject alternativeVladislav Vaintroub2019-04-2817-471/+488
| | | | | | | | | | | | | | names Added a call to X509_check_ip_asc() in case server_hostname represents an IP address.
* | MDEV-13335 UTF8 escape wildcard LIKE match has different behavior in ↵Alexander Barkov2019-04-2821-0/+228
| | | | | | | | | | | | different collations The fix for MDEV-17064 addressed this problem. Adding tests only.
* | MDEV-19351 statistics_for_command_is_needed: Conditional jump or moveIgor Babaev2019-04-271-0/+1
| | | | | | | | | | | | | | | | depends on uninitialised value Initialized THD::force_read_stats introduced in the patch for MDEV-17605. Leaving this field uninitialized in the constructor of the THD class may trigger reading statistical data that is not needed.
* | MDEV-19350 Server crashes in delete_tree_element / ... / ↵Sergei Golubchik2019-04-273-2/+40
| | | | | | | | | | | | | | Item_func_group_concat::repack_tree Item_func_group_concat stores values in `tree`, which is often, but not always the same as `&tree_base`.
* | gis2 fails in embeddedSergei Golubchik2019-04-274-31/+32
| | | | | | | | | | move privilege specific part of gis2.test to gis_notembedded.test and the rest to gis.test
* | MDEV-19334: bool is_eits_usable(Field*): Assertion ↵Varun Gupta2019-04-273-4/+40
| | | | | | | | | | | | `field->table->stats_is_read' failed. Fixed the assert by making sure that not to use EITS if the column statistics was not allocated.
* | MDEV-11015 Assertion failed: precision > 0 in decimal_bin_size upon SELECT ↵Alexander Barkov2019-04-273-6/+60
| | | | | | | | | | | | | | | | | | | | | | with DISTINCT, CAST and other functions Item_func_min_max::fix_length_and_dec() erroneously set max_length to UINT32_MAX. Merge notes: In 10.3 this problem had been fixed earlier. During merge to 10.3, do a "null merge" in item_func.cc
* | CONNECT compilation failureSergei Golubchik2019-04-263-11/+3
| |
* | Merge branch 'merge-tokudb-5.6' into 10.1Sergei Golubchik2019-04-269-13/+109
|\ \
| * | 5.6.43-84.3Sergei Golubchik2019-04-2643-1088/+1888
| | |
* | | Squashed commit of connect/10.0:Olivier Bertrand2019-04-2614-180/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit ac275d0b4ad (connect/10.0) Author: Olivier Bertrand <bertrandop@gmail.com> Date: Wed Mar 27 12:46:20 2019 +0100 Comment out unrecognized command line options: Modified CMakeLists.txt commit 592f1f75ad6 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Tue Mar 26 19:52:33 2019 +0100 Replace Command not recognized by CMake modified: CMakeLists.txt commit 00f72199b16 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Tue Mar 26 18:15:08 2019 +0100 - Fix MDEV-15793: Server crash in PlugCloseFile with sql_mode='' Fixed by replacing sprinf by snprintf in ShowValue to avoid buffer overflow. It nows always use a buffer and returns int. modified: storage/connect/tabdos.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/value.cpp modified: storage/connect/value.h - Fix MDEV-18292: CONNECT Engine JDBC not able to issue simple UPDATE statement from trigger or stored procedure Was not fixed when the same table was called several times with different modes. Fixed by checking if a new statement is compatible in the start_stmt function. It nows do the same checks than external_lock. modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h - typo modified: storage/connect/user_connect.cc - Fix GetTableName that returned wrong value under Windows modified: storage/connect/ha_connect.cc - Fix MDEV-13136: enhance CREATE SERVER MyServerName FOREIGN DATA WRAPPER to work with CONNECT engine modified: storage/connect/tabjdbc.cpp - Add a function to retrieve User variable value (DEVELOPMENT only) modified: storage/connect/ha_connect.cc modified: storage/connect/jsonudf.cpp modified: storage/connect/jsonudf.h modified: storage/connect/tabjdbc.cpp - Fix MDEV-18192: CONNECT Engine JDBC not able to issue simple UPDATE statement from trigger or stored procedure modified: storage/connect/tabext.cpp modified: storage/connect/tabext.h modified: storage/connect/tabjdbc.cpp - Enable CONNECT tables to have triggers Update version number modified: storage/connect/ha_connect.cc - Make user and password defined in CREATE TABLE have precedence on the ones specified in a Federated Server. modified: storage/connect/tabjdbc.cpp - JSONColumns: Copy locally constant strings to fix error in OEM modules modified: storage/connect/tabjson.cpp commit 99de7f4e486 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Sun Jan 27 15:16:15 2019 +0100 - Fix MDEV-18192: CONNECT Engine JDBC not able to issue simple UPDATE statement from trigger or stored procedure modified: storage/connect/tabext.cpp modified: storage/connect/tabext.h modified: storage/connect/tabjdbc.cpp - Enable CONNECT tables to have triggers Update version number modified: storage/connect/ha_connect.cc - Make user and password defined in CREATE TABLE have precedence on the ones specified in a Federated Server. modified: storage/connect/tabjdbc.cpp - JSONColumns: Copy locally constant strings to fix error in OEM modules modified: storage/connect/tabjson.cpp