summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* experimental patch10.2-MDEV-24962-addendumJulius Goryavsky2021-05-096-310/+363
|
* MDEV-24962 addendum: more accurate handling of spaces in variable valuesJulius Goryavsky2021-05-074-33/+40
|
* MDEV-25418 addendum: other certificates selected to match hostnameJulius Goryavsky2021-05-064-8/+6
|
* MDEV-24962 addendum: improved ipv6 handling for stunnel and for SST via ↵Julius Goryavsky2021-05-064-42/+38
| | | | mysqldump
* MDEV-25418: Improve mariabackup SST script compliance with native MariaDB ↵Alexey Yurchenko2021-05-066-46/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSL practices and configuration. 1. Pass joiner's authentication information to donor together with address in State Transfer Request. This allows joiner to authenticate donor on connection. Previously joiner would accept data from anywhere. 2. Deprecate custom SSL configuration variables tca, tcert and tkey in favor of more familiar ssl-ca, ssl-cert and ssl-key. For backward compatibility tca, tcert and tkey are still supported. 3. Allow falling back to server-wide SSL configuration in [mysqld] if no SSL configuration is found in [sst] section of the config file. 4. Introduce ssl-mode variable in [sst] section that takes standard values and has following effects: - old-style SSL configuration present in [sst]: no effect otherwise: - ssl-mode=DISABLED or absent: retains old, backward compatible behavior and ignores any other SSL configuration - ssl-mode=VERIFY*: verify joiner's certificate and CN on donor, verify donor's secret on joiner (passed to donor via State Transfer Request) BACKWARD INCOMPATIBLE BEHAVIOR - anything else enables new SSL configuration convetions but does not require verification ssl-mode should be set to VERIFY only in a fully upgraded cluster. Examples: [mysqld] ssl-cert=/path/to/cert ssl-key=/path/to/key ssl-ca=/path/to/ca [sst] -- server-wide SSL configuration is ignored, SST does not use SSL [mysqld] ssl-cert=/path/to/cert ssl-key=/path/to/key ssl-ca=/path/to/ca [sst] ssl-mode=REQUIRED -- use server-wide SSL configuration for SST but don't attempt to verify the peer identity [sst] ssl-cert=/path/to/cert ssl-key=/path/to/key ssl-ca=/path/to/ca ssl-mode=VERIFY_CA -- use SST-specific SSL configuration for SST and require verification on both sides Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>
* MDEV-25418 rsync SST does not work with stunnel encryptionAlexey Yurchenko2021-05-066-0/+888
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix eval command line to correctly pass stunnel option to rsync on donor. 2. Deprecate `tkey`, `tcert` and `tca` options in [sst] section in favor of conventional `ssl-key`, `ssl-cert` and `ssl-ca`, but keep their precedence for backward compatibility. 3. Default to require SSL encryption if at least SSL key and cert files are specified in configuration, either in [sst] or [mysqld] sections. 4. Enable `verify*` option for stunnel on donor only if a. CA file is specified somewhere in the configuration b. it is explicitly requested in [sst] section by either specifying ssl-mode or CA file there. In this case if ssl-mode is not explicitly given, it defaults to VERIFY_CA. ssl-mode maps to stunnel options as follows: VERIFY_CA -> verifyChain = yes VERIFY_IDENTITY -> verifyPeer = yes Example to require donor to verify joiner identity: ``` [mysqld] ssl-cert=/path/to/cert ssl-key=/path/to/key ssl-ca=/path/to/ca [sst] ssl-mode=VERIFY_IDENTITY ``` 5. If SSL verification is requested, joiner verifies donor by checking the secret passed to donor via SST request. Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>
* MDEV-24962 addendum: improved handling of paths with spacesJulius Goryavsky2021-05-062-14/+16
|
* MDEV-24962 addendum: mariabackup does not understand --log-bin-index and ↵Julius Goryavsky2021-05-061-3/+13
| | | | --log-basename options
* MDEV-21603 Crashing SHOW TABLES with derived table in WHERE conditionSergei Golubchik2021-05-047-23/+67
| | | | | | | | | | When you only need view structure, don't call handle_derived with DT_CREATE and rely on its internal hackish check to skip DT_CREATE. Because handle_derived is called from many different places, and this internal hackish check is indiscriminative. Instead, just don't ask handle_derived to do DT_CREATE if you don't want it to do DT_CREATE.
* MDEV-24962: Galera SST innobackupex-move ignores Environment settingsJulius Goryavsky2021-05-0415-846/+1376
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After switching to the new mariabackup interface (instead of the outdated innobackupex interface, which is supported for compatibility), we need to explicitly pass a path to the datadir directory as a parameter, since in the new interface the value of this option is not automatically set in such a way that it always matches the SST/IST logic. This commit adds passing this option as an explicit parameter to mariabackup. This commit also removed unnecessary options that are not used and not supported by mariabackup. Also, numerous flaws in the common wsrep_sst_common script have been fixed: 1) There are many bash-specific constructs in the script that may not be supported by other interpreters, which can lead to the most unexpected errors during SST, because failures in the interpretation of bash-specific constructs lead to incorrect parsing of arguments; 2) There is parse_cnf() function which is often called by other scripts for the "mysqld" or "--mysqld" group, but it does not take into account the default group suffix, which leads to reading values only from the default group, which then leads to errors due to reading the default values instead of the values for a specific group; 3) Some options such as --user, --innodb-data-home-dir or --datadir are not removed from the --mysqld-args list, although they are processed inside scripts (and passing of these options funther may cause problems for mariabackup); 4) If an argument that the script understands is present in the --mysqld-args list twice, then this causes SST to fail, instead of reading the most recent value; 5) The "--host" parameter is technically still supported among the arguments of the SST scripts, but in reality scripts do not work with it as expected, especially if it has an IPv6 address; 6) If the port number is absent in the --address parameter value, but the port number is explicitly passed through the --port argument, then the scripts for mariabackup and xtrabackup-v2 fail; 7) If a new address interface is used (with the --address parameter), then automatic default port substitution is not performed, although it is supported for the legacy --host/--port interface. 8) If there are spaces in the parameter values after --mysqld_args, then their further transfer does not occur correctly, which causes mariabackup to fail during SST - the space splits the argument in such a way that it breaks the parsing of the following parameters; 9) If most of the parameters that are names or paths to the files or directories contain spaces, then SST scripts fail in an unpredictable way due to incorrect variable substitutions; 10) If the --log-bin option is passed among the arguments of myqlds (--mysqld-args) without a parameter, and the --binlog option is not specified, then the script cannot substitute the default name for binlog and cannot construct binlog name using the --log-basename argument (which is against server specifications); 11) Tail slashes are not removed from the directory names, which, upon further substitution, leads to the appearance of a double slash in the file paths; 12) The explicit --binlog parameter (which is now always transmitted from the server side) and the "hidden" --log-bin parameter in the list of arguments after --mysqld-args are perceived as two different parameters in different parts of the scripts, and if they are do not match for some reason, this will lead to failures during SST; Also, all new changes from the 10.6 branch have been migrated here, including the latest pull requests for authentication (only the part that concerns SST scripts). It also fixes dozens of other bugs in all SST scripts.
* wsrep sst scripts: removing extra blank lines and spacesJulius Goryavsky2021-05-036-377/+329
| | | | | | | | | Removed numerous extra blank lines and spaces that interfere with reading and understanding program code, making it more difficult to find errors in scripts. I also removed all extra trailing spaces at the ends of lines, which lead to marking extra lines as changes (in subsequent changes). The amount of indentation in some parts of the code has also been normalized.
* MDEV-10674: main.show_explain failed in buildbotSergei Petrunia2021-05-032-1/+9
| | | | | | | | | | Fix a race condition in the testcase. The testcase assumed that State='Sending data' means that the thread is already in an InnoDB lock wait. This is not case, there is a gap between the state changing to Sending data and execution reaching the point where it is waiting for a lock. Use a more precise check instead, through I_S.INNODB_TRX.
* MDEV-25584 Implement posix semantics file deletion for Windows 10Vladislav Vaintroub2021-05-031-6/+27
|
* MDEV-16146: MariaDB slave stops with following errors.Sujatha2021-04-305-10/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: ======== 180511 11:07:58 [ERROR] Slave I/O: Unexpected master's heartbeat data: heartbeat is not compatible with local info;the event's data: log_file_name mysql-bin.000009 log_pos 1054262041, Error_code: 1623 Analysis: ========= In replication setup when master server doesn't have any events to send to slave server it sends an 'Heartbeat_log_event'. This event carries the current binary log filename and offset details. The offset values is stored within 4 bytes of event header. When the size of binary log is higher than UINT32_MAX the log_pos values will not fit in 4 bytes memory. It overflows and hence slave stops with an error. Fix: === Since we cannot extend the common_header of Log_event class, a greater than 4GB value of Log_event::log_pos is made to be transported with a HeartBeat event's sub-header. Log_event::log_pos in such case is set to zero to indicate that the 8 byte sub-header is allocated in the event. In case of cross version replication following behaviour is expected OLD - Server without fix NEW - Server with fix OLD<->NEW : works bidirectionally as long as the binlog offset is (normally) within 4GB. When log_pos > UINT32_MAX OLD->NEW : The 'log_pos' is bound to overflow and NEW slave may report an invalid event/incompatible heart beat event error. NEW->OLD : Since patched server sets log_pos=0 on overflow, OLD slave will report invalid event error.
* MDEV-25536 InnoDB: Failing assertion: sym_node->table != NULL in ↵st-10.2-thiruThirunarayanan Balathandayuthapani2021-04-301-0/+1
| | | | | | pars_retrieve_table_def - Fixing post-push failure of innodb_fts_misc_1 test case.
* MDEV-25536 InnoDB: Failing assertion: sym_node->table != NULL in ↵Thirunarayanan Balathandayuthapani2021-04-303-1/+22
| | | | | | | | | pars_retrieve_table_def InnoDB tries to fetch the deleted doc ids for discarded tablespace. In i_s_fts_deleted_generic_fill(), InnoDB needs to check whether the table is discarded or not before fetching deleted doc ids.
* MDEV-25568 RENAME TABLE causes "Ignoring data file" messagesMarko Mäkelä2021-04-303-15/+4
| | | | | | | fil_ibd_load(): Remove a message that is basically saying that everything works as expected. The other "Ignoring data file" message about the presence of an extraneous file will be retained (and expected by the test innodb.log_file_name).
* Revert "update CC"Nikita Malyavin2021-04-301-0/+0
| | | | This reverts commit 8880dff2d90ea8a8279cbcb466f90e0b2fdfcff5.
* update CCNikita Malyavin2021-04-291-0/+0
|
* Merge remote-tracking branch 'connect/10.2' into 10.2Nikita Malyavin2021-04-2921-296/+512
|\
| * Typo modified: CMakeLists.txtOlivier Bertrand2021-04-091-1/+1
| |
| * Remove add_jar modified: CMakeLists.txtOlivier Bertrand2021-04-091-2/+1
| |
| * Fix add_jar modified: CMakeLists.txtOlivier Bertrand2021-04-091-0/+2
| |
| * Fix install modified: CMakeLists.txtOlivier Bertrand2021-04-091-3/+5
| |
| * typo tabrest.cppOlivier Bertrand2021-04-081-1/+1
| |
| * tabrest.cppOlivier Bertrand2021-04-081-63/+8
| |
| * tabrest.cppOlivier Bertrand2021-04-081-1/+4
| |
| * tabrest.cppOlivier Bertrand2021-04-081-1/+1
| |
| * try to fix tabrest.cpp compile errorOlivier Bertrand2021-04-081-1/+1
| |
| * - Fix Linux compile errorsOlivier Bertrand2021-04-082-23/+17
| | | | | | | | | | | | | | | | modified: storage/connect/tabrest.cpp modified: storage/connect/CMakeLists.txt - Fix cmake error modified: libmariadb/cmake/ConnectorName.cmake
| * Test tabrest.cpp fixOlivier Bertrand2021-04-081-2/+1
| |
| * Commit last pull from originOlivier Bertrand2021-04-06774-13537/+18745
| |\
| * | - Fix(?) Linux compile errorsOlivier Bertrand2021-04-063-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/tabrest.cpp modified: storage/connect/CMakeLists.txt -fix MDEV-24794 modified: storage/connect/valblk.h
| * | - Fix crash when not specifying the collection for MongoDBOlivier Bertrand2021-04-052-1/+7
| | | | | | | | | | | | | | | | | | | | | modified: storage/connect/cmgoconn.cpp - Fix(?) Linux compile errors modified: storage/connect/tabrest.cpp
| * | - Copy Mongo2.jar and Mongo3.jar in plugin directoryOlivier Bertrand2021-04-058-47/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/CMakeLists.txt modified: storage/connect/javaconn.cpp - Check privileges while creating tables with Discovery modified: storage/connect/ha_connect.cc - Calculate LRECL for JSON tables created with Discovery modified: storage/connect/tabjson.cpp - Use CreateProcess (Windows) or fork/exec (linux) to retrieve the result from REST queries modified: storage/connect/tabrest.cpp - Typo modified: storage/connect/jmgoconn.cpp
| * | - Fix bug making REST table fail using CURLOlivier Bertrand2021-03-167-61/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This when the HTTP contains & characters modified: storage/connect/tabbson.cpp modified: storage/connect/tabjson.cpp - Make stringfy option work on only one Json item modified: storage/connect/tabbson.cpp modified: storage/connect/tabbson.h modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h - Make Json/Bson DATE columns accept JSON date syntax modified: storage/connect/tabbson.cpp modified: storage/connect/tabjson.cpp - Fix bug making REST table default file not being erased when dropping the table modified: storage/connect/tabbson.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/tabrest.cpp modified: storage/connect/tabxml.cpp - Suppress CHAR(36) --> VARCHAR(36) when DEVELOPMENT This was fixed in MyClient modified: storage/connect/ha_connect.cc
| * | - Add new JPATH featuresOlivier Bertrand2021-02-1610-122/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/bson.cpp modified: storage/connect/bsonudf.cpp modified: storage/connect/bsonudf.h modified: storage/connect/json.cpp modified: storage/connect/jsonudf.cpp modified: storage/connect/jsonudf.h modified: storage/connect/mysql-test/connect/r/json_udf.result modified: storage/connect/tabbson.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h
| * | Fix bson_object_grp inverted args. Modified: storage/connect/bsonudf.cpp and ↵Olivier Bertrand2021-02-052-7/+7
| | | | | | | | | | | | bson_udf.result
| * | - Fix bug causing bnx base wrong after CheckMemoryOlivier Bertrand2021-02-053-3/+18
| | | | | | | | | | | | | | | | | | | | | Add negative array indexes starting from the last modified: storage/connect/bson.cpp modified: storage/connect/bsonudf.cpp modified: storage/connect/json.cpp
* | | Another correction of the patch for MDEV-24823.Igor Babaev2021-04-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commits replaces the call of the function setup_tables() with a call of the function setup_tables_and_check_access() in the method Multiupdate_prelocking_strategy::handle_end(). There is no known bug that would require this change. However the change aligns this piece of code with the code existed before the patch for MDEV-24823.
* | | MDEV-25543: Building failure on MacOS in case MariadDB server is compiled ↵bb-10.2-MDEV-25543Dmitry Shulga2021-04-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with XCode 12.5 Attempt to build MariaDB server on MacOS could result in compilation errors like the following one: In file included from server-10.2/storage/perfschema/cursor_by_account.cc:28: In file included from server-10.2/include/my_global.h:287: In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk/usr/include/c++/v1/math.h:309: In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk/usr/include/c++/v1/type_traits:418: server-10.2/version:1:1: error: expected unqualified-id MYSQL_VERSION_MAJOR=10 ^ server-10.2/build.dir/include/my_config.h:529:29: note: expanded from macro 'MYSQL_VERSION_MAJOR' This kind of compiler errors occur by the reson that compiler's system headers contain the directive '#include <version>' and a compiler is invoked with -I${CMAKE_SOURCE_DIR}. The MariaDB source code root directory contains the file VERSION that is handled by the compiler during processing the directive #include <version> since file names on MacOS are case insensetive, so version and VERSION is treated as the same file name. To fix the issue the source code root directory should be removed from a list of directories used by the compiler for include search path.
* | | Bug#29363867: LOST CONNECTION TO MYSQL SERVER DURING QUERYbb-10.2-BUG29363867Oleksandr Byelkin2021-04-284-17/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that sharing default expression among set instruction leads to attempt access result field of function created in other instruction runtime MEM_ROOT and already freed (a bit different then MySQL problem). Fix is the same as in MySQL (but no optimisation for constant), turn DECLARE a, b, c type DEFAULT expr; to DECLARE a type DEFAULT expr, b type DEFAULT a, c type DEFAULT a;
* | | MDEV-25319 : Long BF log wait turns on InnoDB Monitor output without ↵bb-10.2-MDEV-21514Jan Lindström2021-04-283-14/+66
| | | | | | | | | | | | | | | | | | | | | telling, never turns it off Removed explicit InnoDB monitor startup and used just functions to print current lock information.
* | | MDEV-25258 : SET PASSWORD command fail with wsrep apiJan Lindström2021-04-283-1/+38
| | | | | | | | | | | | | | | Problem was that we should skip strict password validation on applier nodes similarly as is done for slave nodes.
* | | MDEV-21514 : Galera test failure on galera.galera_wan_restart_sstJan Lindström2021-04-282-39/+49
| | | | | | | | | | | | | | | Replace unnecessary sleeps with real wait_conditions to make sure correct cluster sizes.
* | | MDEV-19198 - DBUG assert in CREATE IF NOT EXIST under LOCK TABLES WRITEVladislav Vaintroub2021-04-283-1/+38
| | | | | | | | | | | | | | | Relax the assert condition. A locked table that did existed prior to CREATE IF NOT EXIST, retains the MDL_NO_SHARED_READ_WRITE MDL lock prio.
* | | MDEV-25232 update libmariadbVladislav Vaintroub2021-04-281-0/+0
| | |
* | | MDEV-25232 - CMake deprecation warning about CMAKE_MINIMUM_REQUIRED < 2.8.12Vladislav Vaintroub2021-04-282-15/+14
| | |
* | | Bug#29363867: LOST CONNECTION TO MYSQL SERVER DURING QUERYSergei Golubchik2021-04-275-27/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | plugin variables in SET only locked the plugin till the end of the statement. If SET with a plugin variable was prepared, it was possible to uninstall the plugin before EXECUTE. Then EXECUTE would crash, trying to resolve a now-invalid pointer to a disappeared variable. Fix: keep plugins locked until the prepared statement is closed.
* | | Bug #31674599: THE UDF_INIT() FUNCTION CAUSE SERVER CRASHSergei Golubchik2021-04-273-3/+21
| | |