summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.9' into 10.10mariadb-10.10.2Oleksandr Byelkin2022-11-0312-796/+112
|\
| * Merge branch '10.8' into 10.9Oleksandr Byelkin2022-11-0212-796/+112
| |\
| | * Merge branch '10.7' into 10.8Oleksandr Byelkin2022-11-0212-796/+112
| | |\
| | | * Merge branch '10.6' into 10.7Oleksandr Byelkin2022-11-0212-796/+112
| | | |\
| | | | * Merge branch '10.5' into 10.6Oleksandr Byelkin2022-11-023-797/+58
| | | | |\
| | | | | * Merge branch '10.4' into 10.5Oleksandr Byelkin2022-10-263-797/+58
| | | | | |\
| | | | | | * Merge branch '10.3' into 10.4Oleksandr Byelkin2022-10-263-772/+58
| | | | | | |\
| | | | | | | * MDEV-29490 Renaming internally used client API to avoid name conflictsLawrin Novitsky2022-10-253-772/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with C/C. The patch introduces mariadb_capi_rename.h which is included into mysql.h. The hew header contains macro definitions for the names being renamed. In versions 10.6+(i.e. where sql service exists) the renaming condition in the mariadb_capi_rename.h should be added with && !defined(MYSQL_DYNAMIC_PLUGIN) and look like The patch also contains removal of mysql.h from the api check. Disabling false_duper-6543 test for embedded. ha_federated.so uses C API. C API functions are being renamed in the server, but not renamed in embedded, since embedded server library should have proper C API, as expected by programs using it. Thus the same ha_federated.so cannot work both for server and embedded server library. As all federated tests are already disabled for embedded, federated isn't supposed to work for embedded anyway, and thus the test is being disabled.
* | | | | | | | Merge branch '10.9' into 10.10Oleksandr Byelkin2022-11-012-4/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '10.8' into 10.9Oleksandr Byelkin2022-11-012-4/+5
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-11-012-4/+5
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '10.6' into 10.7Oleksandr Byelkin2022-10-292-4/+5
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge 10.5 into 10.6Marko Mäkelä2022-10-252-4/+5
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent ASAN heap-use-after-poison in the MDEV-16549 part of ./mtr --repeat=6 main.derived the initialization of Name_resolution_context was cleaned up.
| | | | | * | | Merge 10.4 into 10.5Marko Mäkelä2022-10-252-4/+5
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Merge 10.3 into 10.4Marko Mäkelä2022-10-251-2/+3
| | | | | | |\ \ | | | | | | | |/
| | | | | | | * Cleanup the alloca.h header handling to further reduce hardcoded OS lists ↵Brad Smith2022-10-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#2289)
| | | | | | * | MDEV-29481 mariadb-upgrade prints confusing statementAlexander Barkov2022-10-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a new version of the patch instead of the reverted: MDEV-28727 ALTER TABLE ALGORITHM=NOCOPY does not work after upgrade Ignore the difference in key packing flags HA_BINARY_PACK_KEY and HA_PACK_KEY during ALTER to allow ALGORITHM=INSTANT and ALGORITHM=NOCOPY in more cases. If for some reasons (e.g. due to a bug fix such as MDEV-20704) these cumulative (over all segments) flags in KEY::flags are different for the old and new table inside compare_keys_but_name(), the difference in HA_BINARY_PACK_KEY and HA_PACK_KEY in KEY::flags is not really important: MyISAM and Aria can handle such cases well: per-segment flags are stored in MYI and MAI files anyway and they are read during ha_myisam::open() ha_maria::open() time. So indexes get opened with correct per-segment flags that were calculated during the table CREATE time, no matter what the old (CREATE time) and new (ALTER TIME) per-index compression flags are, and no matter if they are equal or not. All other engine ignore key compression flags, so this change is safe for other engines as well.
* | | | | | | | Merge branch '10.9' into 10.10Oleksandr Byelkin2022-10-043-2/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '10.8' into 10.9Oleksandr Byelkin2022-10-043-2/+18
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '10.7' into 10.8Oleksandr Byelkin2022-10-043-2/+18
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '10.6' into 10.7Oleksandr Byelkin2022-10-043-2/+18
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge branch '10.5' into 10.6Sergei Golubchik2022-10-021-0/+11
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge branch '10.4' into 10.5Sergei Golubchik2022-10-021-0/+11
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Merge branch '10.3' into 10.4Sergei Golubchik2022-10-011-0/+11
| | | | | | |\ \ | | | | | | | |/
| | | | | | | * MDEV-17124: mariadb 10.1.34, views and prepared statements: ERROR 1615 ↵Oleksandr Byelkin2022-09-301-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (HY000): Prepared statement needs to be re-prepared The problem is that if table definition cache (TDC) is full of real tables which are in tables cache, view definition can not stay there so will be removed by its own underlying tables. In situation above old mechanism of detection matching definition in PS and current version always require reprepare and so prevent executing the PS. One work around is to increase TDC, other - improve version check for views/triggers (which is done here). Now in suspicious cases we check: - timestamp (microseconds) of the view to be sure that version really have changed; - time (microseconds) of creation of a trigger related to time (microseconds) of statement preparation.
| | | | * | | | Merge branch '10.5' into 10.6Sergei Golubchik2022-09-301-0/+1
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | correctness assertSergei Golubchik2022-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thd_get_ha_data() can be used without a lock, but only from the current thd thread, when calling from anoher thread it *must* be protected by thd->LOCK_thd_data * fix group commit code to take thd->LOCK_thd_data * remove innobase_close_connection() from the innodb background thread, it's not needed after 87775402cd0c and was failing the assert with current_thd==0
| | | | * | | | Merge 10.5 into 10.6Marko Mäkelä2022-09-261-3/+5
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge 10.4 into 10.5Marko Mäkelä2022-09-261-3/+5
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | MDEV-29613 Improve WITH_DBUG_TRACE=OFFMarko Mäkelä2022-09-231-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 28325b08633372cc343dfcbc41fe252020cf6e6e a compile-time option was introduced to disable the macros DBUG_ENTER and DBUG_RETURN or DBUG_VOID_RETURN. The parameter name WITH_DBUG_TRACE would hint that it also covers DBUG_PRINT statements. Let us do that: WITH_DBUG_TRACE=OFF shall disable DBUG_PRINT() as well. A few InnoDB recovery tests used to check that some output from DBUG_PRINT("ib_log", ...) is present. We can live without those checks. Reviewed by: Vladislav Vaintroub
* | | | | | | | Merge 10.9 into 10.10Marko Mäkelä2022-09-211-4/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 10.8 into 10.9Marko Mäkelä2022-09-211-4/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-09-211-4/+6
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge 10.6 into 10.7Marko Mäkelä2022-09-211-4/+6
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge 10.5 into 10.6Marko Mäkelä2022-09-201-4/+6
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge 10.4 into 10.5Marko Mäkelä2022-09-201-1/+1
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Merge 10.3 into 10.4Marko Mäkelä2022-09-201-1/+1
| | | | | | |\ \ | | | | | | | |/
| | | | | | | * MDEV-29543 Windows: Unreadable dlerror() message on localized OSVladislav Vaintroub2022-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force using english for error messages (i.e ASCII) to avoid encoding mixup.
* | | | | | | | Merge 10.9 into 10.10Jan Lindström2022-09-061-37/+37
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 10.8 into 10.9Jan Lindström2022-09-061-37/+37
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.7 into 10.8Jan Lindström2022-09-051-37/+37
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge 10.6 into 10.7Jan Lindström2022-09-051-37/+37
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge 10.5 into 10.6Jan Lindström2022-09-051-37/+37
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge 10.4 into 10.5Jan Lindström2022-09-051-41/+37
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Reduce compilation dependencies on wsrep_mysqld.hDaniele Sciascia2022-08-311-31/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Making changes to wsrep_mysqld.h causes large parts of server code to be recompiled. The reason is that wsrep_mysqld.h is included by sql_class.h, even tough very little of wsrep_mysqld.h is needed in sql_class.h. This commit introduces a new header file, wsrep_on.h, which is meant to be included from sql_class.h, and contains only macros and variable declarations used to determine whether wsrep is enabled. Also, header wsrep.h should only contain definitions that are also used outside of sql/. Therefore, move WSREP_TO_ISOLATION* and WSREP_SYNC_WAIT macros to wsrep_mysqld.h. Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
* | | | | | | | Merge 10.9 into 10.10Marko Mäkelä2022-08-291-4/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 10.8 into 10.9Marko Mäkelä2022-08-291-4/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-08-241-4/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge 10.6 into 10.7Marko Mäkelä2022-08-241-4/+1
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Revert aligned_alloc() addition from MDEV-28836Brad Smith2022-08-221-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As pointed out with MDEV-29308 there are issues with the code as is. MariaDB is built as C++11 / C99. aligned_alloc() is not guarenteed to be exposed when building with any mode other than C++17 / C11. The other *BSD's have their stdlib.h header to expose the function with C+11 anyway, but the issue exists in the C99 code too, the build just does not use -Werror. Linux globally defines _GNU_SOURCE hiding the issue as well.