summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2020-01-3118-93/+100
|\
| * MDEV-21586: Fix a warning for converting my_bool to boolMarko Mäkelä2020-01-311-3/+4
| |
| * Merge 10.1 into 10.2Marko Mäkelä2020-01-319-129/+68
| |\
| | * MDEV-20307: Remove a useless debug check to save stack spaceMarko Mäkelä2020-01-312-84/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fil_space_encrypt(): Remove the debug check that decrypts the just encrypted page. We are exercising the decryption of encrypted pages enough via --suite=encryption,mariabackup. It is a waste of computing resources to decrypt every page immediately after encrypting it. The redundant check had been added in commit 2bedc3978b90bf5abe1029df393c63ced1849bed (MDEV-9931).
| | * MDEV-21564 Assert in trx_purge_add_update_undo_to_history during shutdownThirunarayanan Balathandayuthapani2020-01-302-4/+10
| | | | | | | | | | | | | | | - dict_table_try_drop_aborted() can generate undo logs. So it should be avoided after shutdown of background threads.
| | * MDEV-20923:UBSAN: member access within address … which does not point to ↵Sujatha2020-01-292-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an object of type 'xid_count_per_binlog' Problem: ------- Accessing a member within 'xid_count_per_binlog' structure results in following error when 'UBSAN' is enabled. member access within address 0xXXX which does not point to an object of type 'xid_count_per_binlog' Analysis: --------- The problem appears to be that no constructor for 'xid_count_per_binlog' is being called, and thus the vtable will not be initialized. Fix: --- Defined a parameterized constructor for 'xid_count_per_binlog' class.
| | * MDEV-14330 Move mysqltest.1 man page to appropriate test package from server ↵Daniel Black2020-01-281-2/+3
| | | | | | | | | | | | | | | | | | package Original patch from Daniel Black <daniel@linux.ibm.com>, backported to 10.1.
| | * Ingore sysusers and tmpfiles artifactsVicențiu Ciorbaru2020-01-281-0/+2
| | |
| | * Merge branch 'bb-10.1-release' into 10.1Oleksandr Byelkin2020-01-281-146/+117
| | |\
| | | * List of unstable tests for 10.1.44 releasemariadb-10.1.44Elena Stepanova2020-01-251-146/+117
| | | |
| | * | bump the VERSIONDaniel Bartholomew2020-01-271-1/+1
| | | |
| | * | MDEV-15052: Allow sysusers and tmpfiles install for non-systemd usersRafli Akmal2020-01-241-17/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ..as they have their own tools that parses those files, such as opensysusers[1] that handles sysusers file and opentmpfiles[2] that handles tmpfiles.d settings Because of this. Move both sysusers and tmpfiles 'if' function outside systemd function, allowing independent install Signed-off-by: Rafli Akmal <thefallenrat@artixlinux.org> [1] - https://github.com/artix-linux/opensysusers [2] - https://github.com/OpenRC/opentmpfiles Changes done by vicentiu@mariadb.org, from original author patch: Installing sysusers and tmpfiles without checking for systemd existence means that by default, cmake will ALWAYS install these files. Our general policy is we do not install things which are not needed. However, there is a valid use case when these files are useful, as is described above. To allow this, provide an extra switch that can be enabled during configuring by doing -DINSTALL_SYSTEMD_{SYSUSERS|TMPFILES}=True This will use the default path INSTALL_SYSTEMD_{SYSUSERS|TMPFILES}DIR fetched from install_layout.cmake for rpm & deb based layouts respectively, or they must be overriden if the install_layout is standalone. Example: cmake . -DINSTALL_SYSTEMD_SYSUSERS=True -DINSTALL_SYSTEMD_SYSUSERSDIR=/etc/sysusers.d
| | * | MDEV-17028: Use descriptive file names for sysusers and tmpfiles configurationChristian Hesse2020-01-241-2/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | These files were installed to: ${INSTALL_SYSTEMD_SYSUSERSDIR}/sysusers.conf ${INSTALL_SYSTEMD_TMPFILESDIR}/tmpfiles.conf Instead rename the files to more descriptive file names 'mariadb.conf'.
| * | MDEV-21586 Server does not start if lc_messages setting was not english.Vladislav Vaintroub2020-01-303-3/+5
| | | | | | | | | | | | | | | | | | | | | Fixed a bug introduced in MDEV-11345, server did not start if non-english error messages were set in startup parameters. Added lc_messages=de_DE option into an existing test case.
| * | MDEV-14330: move tokudb manpages to right packagesVicențiu Ciorbaru2020-01-285-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move tokuftdump and tokuft_logprint man pages to storage/tokudb. The man pages are now part of tokudb-engine cmake component. This change is mostly for RPM & DEB based packaging generated through CMake & CPack. Debian upstream already handles this change via the custom scripts in debian/
| * | MDEV-21550 Assertion `!table->fts->in_queue' failed in fts_optimize_remove_tableThirunarayanan Balathandayuthapani2020-01-284-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: ======= The problem is that InnoDB doesn't add the table in fts slots if drop table fails. InnoDB marks the table is in fts slots while processing sync message. So the consecutive alter statement assumes that table is in queue and tries to remove it. But InnoDB can't find the table in fts_slots. Solution: ========= i) Removal of in_queue in fts_t while processing the fts sync message. ii) Add the table to fts_slots when drop table fails.
| * | bump the VERSIONDaniel Bartholomew2020-01-271-1/+1
| | |
| * | List of unstable tests for 10.2.31 releasemariadb-10.2.31Elena Stepanova2020-01-261-225/+307
| | |
* | | Merge branch 'bb-10.3-release' into 10.3Oleksandr Byelkin2020-01-2864-452/+698
|\ \ \
| * | | List of unstable tests for 10.3.22 releasemariadb-10.3.22Elena Stepanova2020-01-261-280/+326
| | | |
| * | | Merge branch 'MDEV-21383' into 10.3Oleksandr Byelkin2020-01-254-1/+194
| |\ \ \
| * \ \ \ Merge branch '10.2' into 10.3Oleksandr Byelkin2020-01-2463-172/+372
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2020-01-247-12/+33
| | |\ \ \ | | | | |/ | | | |/|
| | | * | MDEV-21490: binlog tests fail with valgrind: Conditional jump or move ↵Sujatha2020-01-242-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | depends on uninitialised value in sql_ex_info::init Problem: ======= P1) Conditional jump or move depends on uninitialised value(s) sql_ex_info::init(char const*, char const*, bool) (log_event.cc:3083) code: All the following variables are not initialized. ---- return ((cached_new_format != -1) ? cached_new_format : (cached_new_format=(field_term_len > 1 || enclosed_len > 1 || line_term_len > 1 || line_start_len > 1 || escaped_len > 1))); P2) Conditional jump or move depends on uninitialised value(s) Rows_log_event::Rows_log_event(char const*, unsigned int, Format_description_log_event const*) (log_event.cc:9571) Code: Uninitialized values is reported for 'var_header_len' variable. ---- if (var_header_len < 2 || event_len < static_cast<unsigned int>(var_header_len + (post_start - buf))) P3) Conditional jump or move depends on uninitialised value(s) Table_map_log_event::pack_info(Protocol*) (log_event.cc:11553) code:'m_table_id' is uninitialized. ---- void Table_map_log_event::pack_info(Protocol *protocol) ... size_t bytes= my_snprintf(buf, sizeof(buf), "table_id: %lu (%s.%s)", m_table_id, m_dbnam, m_tblnam); Fix: === P1 - Fix) Initialize cached_new_format,field_term_len, enclosed_len, line_term_len, line_start_len, escaped_len members in default constructor. P2 - Fix) "var_header_len" is initialized by reading the event buffer. In case of an invalid event the buffer will contain invalid data. Hence added a check to validate the event data. If event_len is smaller than valid header length return immediately. P3 - Fix) 'm_table_id' within Table_map_log_event is initialized by reading data from the event buffer. Use 'VALIDATE_BYTES_READ' macro to validate the current state of the buffer. If it is invalid return immediately.
| | | * | MDEV-17601: MariaDB Galera does not expect 'mbstream' as streamfmtJulius Goryavsky2020-01-214-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting "streamfmt=mbstream" in the "[sst]" section causes SST to fail because the format automatically switches to 'tar' by default (insead of mbstream). To fix this, we need to add mbstream to the list of valid values for the format, making it synonymous with xbstream. This must be done both in the SST script and when parsing the options of the corresponding utilities.
| | | * | MDEV-19457: sys_vars.wsrep_provider_basic failed in buildbotJulius Goryavsky2020-01-201-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the initialization of the wsrep provider failed, in some cases the internal variable wrep_inited indicating that the initialization has already been completed is still set to "1", which then leads to confusion in the initialization status. To solve the problem, we should set this variable to "1" only if the wsrep provider initialization really completed successfully. An earlier issue has already been fixed for branch 10.4, and this patch contains a fix for earlier versions (where Galera 3.x is used).
| | * | | MDEV-21509: Work around occasional lost DEBUG_SYNCMarko Mäkelä2020-01-242-4/+10
| | | | |
| | * | | don't run main.ssl_system_ca in --embeddedSergei Golubchik2020-01-231-0/+2
| | | | | | | | | | | | | | | | | | | | this test needs a *server* and tries to connect with $MYSQL to it
| | * | | MENT-464 ASAN MTR quick test - some failures to be investigated.Alexey Botchkov2020-01-242-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | PCRE reports small frame size working with ASAN, so the test has to be ready for the minimlas possible size.
| | * | | Remove an unused tokuvalgrind scriptMarko Mäkelä2020-01-232-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the only symlink in the repository. Symlinks can cause trouble when using file systems or operating systems that do not support them. Also remove the unused file DartConfig.cmake that refers to the script.
| | * | | MDEV-20775: page_zip_validate() failure due to AUTO_INCREMENTMarko Mäkelä2020-01-231-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmake -DWITH_INNODB_EXTRA_DEBUG:BOOL=ON was broken ever since commit 8777458a6eb73ac1d7d864ebac390ea7039e21c1 (MDEV-6076 Persistent AUTO_INCREMENT for InnoDB). There is a race condition between page reads that call page_zip_validate() (while holding clustered index root page S-latch) and writes that update PAGE_ROOT_AUTO_INC (with buf_block_t::lock SX-latch, compatible with S-latch). page_zip_validate_low(): Skip the PAGE_ROOT_AUTO_INC field on clustered index root pages in order to avoid false positives.
| | * | | MDEV-14183: aria_pack segfaults in compress_maria_fileVlad Lesin2020-01-232-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post-push fix. aria_pack_mdev14183 test is unstable. The fix is the following: 1. Disable the test for embedded server. 2. Create non-"transactional" Aria table in the test, as aria_pack does not support "transactional" Aria tables.
| | * | | new C/C and --ssl-verify-server-cert testsSergei Golubchik2020-01-235-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | tests for --ssl-verify-server-cert with system CA and with incorrect hostname
| | * | | MDEV-21249 MariaDB 10.3.10 When referring to bigint to generate timestamp ↵Sergei Golubchik2020-01-213-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data in the virtual generated column, the value of the generated column does not change when the time zone changes FROM_UNIXTIME() depends on @@time_zone, so it's VCOL_SESSION_FUNC
| | * | | MDEV-14183: aria_pack segfaults in compress_maria_fileVlad Lesin2020-01-213-7/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Column definition order in st_maria_share::columndef can differ from order of fields in record(see also st_maria_share::column_nr, st_maria_columndef::column_nr, _ma_column_nr_write(), _ma_column_nr_read()). This was not taken into account in aria_pack tool. The fix is to initialize elements of HUFF_COUNTS array in the correct order.
| | * | | MDEV-21360 save/restore debud_dbug instead of total reset at the end of the testAlice Sherepa2020-01-214-1/+3
| | | | |
| | * | | MDEV-21360 save/restore debud_dbug instead of total reset at the end of the testAlice Sherepa2020-01-2133-113/+110
| | | | |
| | * | | MDEV-17292 Package the pam_user_map moduleSergei Golubchik2020-01-215-0/+34
| | | | |
| | * | | cleanup: simplify install_layout.cmakeSergei Golubchik2020-01-211-13/+13
| | | | |
* | | | | bump the VERSIONDaniel Bartholomew2020-01-271-1/+1
| |_|_|/ |/| | |
* | | | MDEV-21383: Possible range plan is not used under certain conditionsbb-10.3-mdev21383Sergei Petrunia2020-01-244-1/+194
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Variant 2 of the fix: collect the attached conditions] Problem: make_join_select() has a section of code which starts with "We plan to scan all rows. Check again if we should use an index." the code in that section will [unnecessarily] re-run the range optimizer using this condition: condition_attached_to_current_table AND current_table's_ON_expr Note that the original invocation of range optimizer in make_join_statistics was done using the whole select's WHERE condition. Taking the whole select's WHERE condition and using multiple-equalities allowed the range optimizer to infer more range restrictions. The fix: - Do range optimization using a condition that is an AND of this table's condition and all of the previous tables' conditions. - Also, fix the range optimizer to prefer SEL_ARGs with type=KEY_RANGE over SEL_ARGS with type=MAYBE_KEY, regardless of the key part. Computing key_and( SEL_ARG(type=MAYBE_KEY key_part=1), SEL_ARG(type=KEY_RANGE, key_part=2) ) will now produce the SEL_ARG with type=KEY_RANGE.
* | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-01-21235-771/+2390
|\ \ \ | |/ /
| * | new version CC 3.1Oleksandr Byelkin2020-01-201-0/+0
| | |
| * | Merge branch '10.1' into 10.2Oleksandr Byelkin2020-01-20230-720/+2314
| |\ \ | | |/
| | * Merge branch 'merge-tokudb-5.6' into 10.1Oleksandr Byelkin2020-01-1927-111/+239
| | |\
| | | * 5.6.46-86.2Oleksandr Byelkin2020-01-1928-112/+249
| | | |
| | * | Merge branch 'merge-perfschema-5.6' into 10.1Oleksandr Byelkin2020-01-19184-557/+1844
| | |\ \
| | | * | 5.6.47Oleksandr Byelkin2020-01-19187-569/+1866
| | | | |
| | * | | Merge remote-tracking branch 'connect/10.1' into 10.1Oleksandr Byelkin2020-01-1944-1010/+1299
| | |\ \ \
| | | * | | - Update grant tests for new MariaDB version 10.1.44Olivier Bertrand2020-01-1212-324/+415
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/mysql-test/connect/disabled.def modified: storage/connect/mysql-test/connect/r/grant.result modified: storage/connect/mysql-test/connect/r/ini_grant.result modified: storage/connect/mysql-test/connect/r/mysql_grant.result modified: storage/connect/mysql-test/connect/r/xml2_grant.result modified: storage/connect/mysql-test/connect/r/xml_grant.result modified: storage/connect/mysql-test/connect/t/grant.inc modified: storage/connect/mysql-test/connect/t/grant.test modified: storage/connect/mysql-test/connect/t/grant2.test modified: storage/connect/mysql-test/connect/t/ini_grant.test modified: storage/connect/mysql-test/connect/t/mysql_grant.test