summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-23630: mysqldump-system test fix for 10.4 mergebb-10.4-merge-danielblack-MDEV-23630-mysqldump-testfixDaniel Black2020-11-034-150/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | * global_priv now the global user table * unix_socket now built in * work around for MDEV-24098, SHOW CREATE USER invalid SQL (password expiry ^ account LOCK), which is on the default mariadb.sys@localhost user. Note checksum of global_priv and table_priv after restore is different from that before the restore. The reasons are: select * from mysql.global_priv: a) before: localhost mariadb.sys {"access":0,"plugin":"mysql_native_password","authentication_string":"","account_locked":false,"password_last_changed":0} after: localhost mariadb.sys {"access":0,"plugin":"mysql_native_password","authentication_string":"","password_last_changed":0,"password_lifetime":-1,"default_role":""} b) CREATE USER doesn't insert a "account_locked":false c) root user has a default access value that isn't represented by grants d) password_last_changed isn't saved/restored Windows diff not required any more.
* Merge 10.3 into 10.4Marko Mäkelä2020-11-0234-98/+1639
|\
| * Merge 10.2 into 10.3Marko Mäkelä2020-11-021-1/+1
| |\
| | * fixup a593e03d58f922a99ba49de1bec6810fc7e9874f: nullptrMarko Mäkelä2020-11-021-1/+1
| | | | | | | | | | | | C++11 is allowed only starting with MariaDB Server 10.4.
| * | Merge 10.2 into 10.3Marko Mäkelä2020-11-0232-96/+1635
| |\ \ | | |/
| | * MDEV-22387: Do not violate __attribute__((nonnull))Marko Mäkelä2020-11-0222-47/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This follows up commit commit 94a520ddbe39ae97de1135d98699cf2674e6b77e and commit 7c5519c12d46ead947d341cbdcbb6fbbe4d4fe1b. After these changes, the default test suites on a cmake -DWITH_UBSAN=ON build no longer fail due to passing null pointers as parameters that are declared to never be null, but plenty of other runtime errors remain.
| | * Merge bb-10.2-release into 10.2Marko Mäkelä2020-11-029-385/+416
| | |\
| | | * List of unstable tests for 10.2.35 releasemariadb-10.2.35Elena Stepanova2020-10-311-384/+352
| | | |
| | * | MDEV-23630 fixup: main.mysqldump resultMarko Mäkelä2020-11-021-2/+3
| | | | | | | | | | | | | | | | This was missed in commit d6ea03fa94dc008b30932bf1e8ea40c3346f51c8.
| | * | Add dbug_print_sel_arg() debugging help functionSergei Petrunia2020-11-011-0/+107
| | | |
| | * | MDEV-23630: mysqldump logically dump system table informationDaniel Black2020-11-015-19/+1406
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add --system={all, users, plugins, udfs, servers, stats, timezones} This will dump system information from the server in a logical form like: * CREATE USER * GRANT * SET DEFAULT ROLE * CREATE ROLE * CREATE SERVER * INSTALL PLUGIN * CREATE FUNCTION "stats" is the innodb statistics tables or EITS and these are dumped as INSERT/REPLACE INTO statements without recreating the table. "timezones" is the collection of timezone tables which are important to transfer to generate identical results on restoration. Two other options have an effect on the SQL generated by --system=all. These are mutually exclusive of each other. * --replace * --insert-ignore --replace will include "OR REPLACE" into the logical form like: * CREATE OR REPLACE USER ... * DROP ROLE IF EXISTS (MySQL-8.0+) * CREATE OR REPLACE ROLE ... * UNINSTALL PLUGIN IF EXISTS (10.4+) ... (before INSTALL PLUGIN) * DROP FUNCTION IF EXISTS (MySQL-5.7+) * CREATE OR REPLACE [AGGREGATE] FUNCTION * CREATE OR REPLACE SERVER --insert-ignore uses the construct " IF NOT EXISTS" where supported in the logical syntax. 'CREATE OR REPLACE USER' includes protection against being run as the same user that is importing the mysqldump. Includes experimental support for dumping mysql-5.7/8.0 system tables and exporting logical SQL compatible with MySQL. Updates mysqldump man page, including this information and (removing obsolute bug reference) Reviewed-by: anel@mariadb.org
| | * | Fix RPM packaging on cmake 3.18+Sergei Golubchik2020-10-301-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmake has caught up and since version 3.18 it started supporting CPACK_RPM_POST_TRANS_SCRIPT_FILE, something we've supported for two years and cmake 2.8.11. Both implementation add %posttrans tag and rpmbuild gets confused. Disable our implementation for cmake 3.18+
| * | | List of unstable tests for 10.3.26 releasemariadb-10.3.26Elena Stepanova2020-11-011-464/+373
| | | |
* | | | Merge bb-10.4-release into 10.4Marko Mäkelä2020-11-0264-728/+1591
|\ \ \ \
| * | | | List of unstable tests for 10.4.16 releasemariadb-10.4.16Elena Stepanova2020-11-021-583/+456
| | | | |
| * | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2020-10-3163-145/+1135
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-10-3062-146/+1082
| | |\ \ \ | | | | |/ | | | |/|
| | | * | MDEV-23991 fixup: Initialize the memoryMarko Mäkelä2020-10-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This regression was introduced in commit afc9d00c66db946c8240fe1fa6b345a3a8b6fec1. This is a partial backport of commit 199863d72b7cccaa4c75641c50c45a83b568ab8c from 10.4.
| | | * | Update Connector/CMarko Mäkelä2020-10-301-0/+0
| | | | |
| | | * | MDEV-24033: SIGSEGV in __memcmp_avx2_movbe from queue_insert | SIGSEGV in ↵Varun Gupta2020-10-306-1/+61
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | __memcmp_avx2_movbe from native_compare The issue here was the system variable max_sort_length was being applied to decimals and it was truncating the value for decimals to the number of bytes set by max_sort_length. This was leading to a buffer overflow as the values were written to the buffer without truncation and then we moved the offset to the number of bytes(set by max_sort_length), that are needed for comparison. The fix is to not apply max_sort_length for fixed size types like INT, DECIMALS and only apply max_sort_length for CHAR, VARCHARS, TEXT and BLOBS.
| | | * Fix sporadic test failure on galera_parallel_apply_3nodes.Jan Lindström2020-10-302-5/+23
| | | | | | | | | | | | | | | | Test itself is not deterministic.
| | | * MDEV-19838: fix of error messagesOleksandr Byelkin2020-10-291-5/+2
| | | |
| | | * MDEV-19838: followup, fix for PS & embeddedOleksandr Byelkin2020-10-291-1/+2
| | | | | | | | | | | | | | | | Use 9 byte (min length packet)
| | | * Merge branch '10.1' into 10.2Oleksandr Byelkin2020-10-2916-34/+110
| | | |\
| | | | * MDEV-23702 calculating(auto rounding) issueSergei Golubchik2020-10-2912-24/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement a different fix for "MDEV-19232: Floating point precision / value comparison problem" Instead of truncating decimal values after every division, truncate them for comparison purposes. This reverts commit 62d73df6b270 but keeps the test.
| | | | * update result files after backportSergei Golubchik2020-10-293-12/+0
| | | | | | | | | | | | | | | | | | | | followup for 3e807d255e0e and eae10a87ff60
| | | | * Move result files at the correct place.Oleksandr Byelkin2020-10-293-0/+0
| | | | |
| | | | * MDEV-24040 - fix appveyor buildVladislav Vaintroub2020-10-281-0/+5
| | | | | | | | | | | | | | | | | | | | Old SDK is missing #define SECURITY_MAX_SID_STRING_CHARACTERS
| | | | * MDEV-24040 Named pipe permission issuebb-10.1-wladVladislav Vaintroub2020-10-271-13/+57
| | | | | | | | | | | | | | | | | | | | | | | | | Tighten access control - deny FILE_CREATE_PIPE_INSTANCE permission to everyone except current user (the one that runs mysqld)
| | | * | remove non-working debug assertSergei Golubchik2020-10-292-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | and restore the test modified in the same commit (the non-replication related deadlock will be reported separately)
| | | * | MDEV-19838 Wrong direxec param data caused crashLawrin Novitsky2020-10-292-12/+336
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of direct execution(stmtid=-1, mariadb_stmt_execute_direct in C API) application is in control of how many parameters client sends to the server. In case this number is not equal to actual query parameters number, the server may start to interprete packet data incorrectly, e.g. starting from the size of null bitmap. And that could cause it to crash at some point. The commit introduces some additional COM_STMT_EXECUTE packet sanity checks: - checking that "types sent" byte is set, and the value is equal to 1. if it's not direct execution, then that value is 0 or 1. - checking that parameter type value is a valid type, and parameter flags value is 0 or only "unsigned" bit is set - added more checks that read does not go beyond the end of the packet
| | | * | MDEV-24026: InnoDB: Failing assertion: os_total_large_mem_allocated >= size ↵Vlad Lesin2020-10-295-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upon incremental backup mariabackup deallocated uninitialized write_filt_ctxt.u.wf_incremental_ctxt in xtrabackup_copy_datafile() when some table should be skipped due to parsed DDL redo log record.
| | | * | new CCOleksandr Byelkin2020-10-291-0/+0
| | | | |
| | | * | MDEV-22707 : galera got stuck after flush tablesJan Lindström2020-10-282-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary condition and add necessary include for non debug Galera library.
| | | * | Merge branch '10.1' into 10.2Oleksandr Byelkin2020-10-2823-76/+510
| | | |\ \ | | | | |/
| | | | * test case for BUG#31650096Sergei Golubchik2020-10-272-0/+34
| | | | |
| | | | * cleanup: have_static_innodb.incSergei Golubchik2020-10-274-14/+8
| | | | | | | | | | | | | | | | | | | | and remove unused files
| | | | * BUG#31650096: MYSQL SERVER HEAP-USE-AFTER-FREE IN TRANS_SAVEPOINTKarthik Kamath2020-10-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ANALYSIS: ========= During Bootstrap, while executing the statements from sql file passed to the init-file server option, transaction mem_root was being freed for every statement. This creates an issue with multi statement transactions especially when a statement in the transaction has to access the memory used by the previous statement in the transaction. FIX: ==== Transaction mem_root is freed whenever a transaction is committed or rolled-back. Hence explicitly freeing it is not necessary in the bootstrap implementation. Change-Id: I40f71d49781bf7ad32d474bb176bd6060c9377dc
| | | | * Bug#31304432 "INSUFFICIENT PRIVILEGE CHECK BY LOCK TABLES"Sergei Golubchik2020-10-273-0/+322
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `LOCK TABLES view_name` should require * invoker to have SELECT and LOCK TABLES privileges on the view * either invoker or definer (only if sql security definer) to have SELECT and LOCK TABLES privileges on the used tables/views.
| | | | * cleanup: PRIV_LOCK_TABLES (10.5 style)Sergei Golubchik2020-10-271-18/+17
| | | | |
| | | | * MDEV-14945 possible buffer overflow in stack resolverVicențiu Ciorbaru2020-10-261-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://stackoverflow.com/questions/22827510/how-to-avoid-bad-fd-set-buffer-overflow-crash it seems that using select instead of poll can cause additional memory allocations. As we are in a crashed state, we must prevent allocating any memory (if possible). Thus, switch select call to poll. Also move some bigger datastructures to global space. The code is not run in a multithreaded context so best we don't use up stack space if it's not needed.
| | | | * Fix test failure on wsrep/variables test case.Jan Lindström2020-10-242-0/+10
| | | | |
| | | | * MDEV-24017: Blackhole : Specified key was too long; max key length is 1000 bytesVlad Lesin2020-10-243-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The maximum innodb key length is 3500 what is hardcoded in ha_innobase::max_supported_key_length()). The maximum number of innodb indexes is configured with MAX_INDEXES macro (see also MAX_KEY definition). The same is currently implemented for blackhole storage engine. Cherry picked from percona-server 0d90d81c3c507a6b1476246a405504f6e4ef9d4d Original lp bug 1733049 Reviewed-by: daniel@mariadb.org
| | | | * Merge remote-tracking branch 'connect/10.1' into 10.1Oleksandr Byelkin2020-10-2417-108/+511
| | | | |\
| | | | | * - Fix MDEV-22571 and MDEV-22572. Allow multiple ZIP tableOlivier Bertrand2020-07-1617-108/+511
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and enable using special column in them. modified: storage/connect/tabzip.cpp modified: storage/connect/tabzip.h - Fix some compiler errors modified: storage/connect/tabcmg.cpp
| | | | * | MDEV-20744 SET GLOBAL `replicate_do_db` = DEFAULT causes crash.bb-10.1-hfAlexey Botchkov2020-10-233-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | DEFAULT for the replicate_do_db is the "" as our documentation states.
| | | | * | MDEV-23358 main.upgrade_MDEV-19650 fails with result differenceSergei Golubchik2020-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When including a generated file, always use <...>. We need the compiler to find it in the BINDIR, not in the SRCDIR. But when including as "..." SRCDIR is always searched first. The bug can only happen in out-of-source builds, if there was an in-source build before.
| | | | * | MDEV-10149: sys_vars.rpl_init_slave_func fails sporadically in buildbotSujatha2020-10-222-27/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | problem: ======== mysqltest: In included file "./include/assert.inc": included from mysql-test/suite/sys_vars/t/rpl_init_slave_func.test at line 69: Assertion text: '@@global.max_connections = @start_max_connections' Assertion result: '0' mysqltest: In included file "./include/assert.inc": included from mysql-test/suite/sys_vars/t/rpl_init_slave_func.test at line 86: Assertion text: '@@global.max_connections = @start_max_connections + 1' Assertion result: '0' Analysis: ========= A slave SQL thread sets its Running state to Yes very early in its initialisation, before the majority of initialisation actions, including executing the init_slave command, are done. Thus the testcase has a race condition where the initial replication setup might finish executing later than the testcase SET GLOBAL init_slave, making the testcase see its effect where it checks for its absence. Fix: === Include 'sync_slave_sql_with_master.inc' at the beginning of the test to ensure that slave applier has completed the execution of 'init_slave' command and proceeded to event application. Replace the apparently needless RESET MASTER / RESET SLAVE etc. Patch is based on: https://github.com/percona/percona-server/pull/1464/commits/b91e2e6f90611aa299c302929fb8b068e8ac0dee Author: laurynas-biveinis
| | * | | | MDEV-23222 SIGSEG in maria_create() because of double freeMonty2020-10-293-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash happens because a double free in the case CREATE TABLE fails because there is a conflicting tables on disk. Fixed by ensuring that the double free can't happen.
| | * | | | Fixed bug in detection of getgrouplist parameters.Monty2020-10-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On my system, OpenSuse, I got a compilation error that some arguments to getgrouplist() where not initialized