summaryrefslogtreecommitdiff
path: root/.gitignore
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.7' into 10.8Sergei Golubchik2022-05-111-0/+1
|\
| * Merge branch '10.6' into 10.7Sergei Golubchik2022-05-111-0/+1
| |\
| | * Merge branch '10.5' into 10.6Sergei Golubchik2022-05-101-0/+1
| | |\
| | | * Merge branch '10.4' into 10.5Sergei Golubchik2022-05-091-0/+1
| | | |\
| | | | * Merge branch '10.3' into 10.4Sergei Golubchik2022-05-081-0/+1
| | | | |\
| | | | | * .gitignoreSergei Golubchik2022-04-211-0/+1
| | | | | |
* | | | | | .gitignoreSergei Golubchik2022-02-041-0/+1
| | | | | |
* | | | | | Revert "Improve LibFMT detection"Sergei Golubchik2021-12-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9feaa6be07f8eb91736e51830f754bc99f939a51. No, we do NOT support fmt 6.x, it formats values differently. And we MUST use FMT_HEADER_ONLY
* | | | | | Improve LibFMT detectionSergei Krivonos2021-12-041-1/+1
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Sergei Krivonos <sergei.krivonos@mariadb.com>
* | | | | Merge 10.6 into 10.7Marko Mäkelä2021-10-221-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.5 into 10.6Marko Mäkelä2021-10-181-0/+3
| |\ \ \ \ | | |/ / /
| | * | | Implemented Json_writer_array & Json_writer_object subitems name presence ↵Sergei Krivonos2021-10-161-0/+3
| | | | | | | | | | | | | | | | | | | | control
* | | | | Merge 10.6 into 10.7Marko Mäkelä2021-10-131-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.5 into 10.6Marko Mäkelä2021-10-131-1/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | The changes to galera.galear_var_replicate_myisam_on in commit d9b933bec6061758c5d7b34f55afcae32a85c110 are omitted due to conflicts with commit 27d66d644cf2ebe9201e0362f2050036cce2908a.
| | * | | Merge 10.4 into 10.5Marko Mäkelä2021-10-131-1/+2
| | |\ \ \ | | | |/ /
| | | * | Merge 10.3 into 10.4Marko Mäkelä2021-10-131-1/+2
| | | |\ \ | | | | |/
| | | | * Merge 10.2 into 10.3Marko Mäkelä2021-10-131-0/+2
| | | | |\
| | | | | * Xcode compatibility updateSergei Krivonos2021-10-121-0/+2
| | | | | |
| | * | | | Backport "Fix generation of bison output for out-of-source builds."to 10.5Vladislav Vaintroub2021-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Apply 115fec58f16d3c49 to 10.5
* | | | | | MDEV-25015 Custom formatting of strings in MariaDB queriesAlan Cueva2021-10-121-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SFORMAT() SQL function that uses fmtlib (https://fmt.dev/) for python-like (also Rust, C++20, etc) string formatting Only fmtlib 7.0.0+ is supported, older fmtlib produces different results in the test. No native support for temporal and decimal values, * TIME_RESULT is handled as STRING_RESULT * DECIMAL_RESULT as REAL_RESULT
* | | | | Fix generation of bison output for out-of-source builds.Vladislav Vaintroub2021-09-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the #line directives contain existing source file sql_yacc.yy. Before the patch #line directive would point out to non-existing path in current build directory.
* | | | | Merge 10.5 into 10.6Marko Mäkelä2021-07-021-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.4 into 10.5Marko Mäkelä2021-07-021-0/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.3 -> 10.4Sergei Petrunia2021-06-301-0/+3
| | |\ \ \ | | | |/ /
| | | * | Merge 10.2->10.3Sergei Petrunia2021-06-301-0/+2
| | | |\ \ | | | | |/
| | | | * MDEV-25129 Add KEYWORDS view to the INFORMATION_SCHEMAxing-zhi, jiang2021-06-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add KEYWORDS table and SQL_FUNCTIONS table to INFORMATION_SCHEMA. This commits needs some minor changes when propagated upwards (e.g. func_array in item_create.cc has a termination element that doesn't exist in later versions of MariaDB)
| | | | * MDEV-13467: Feature request: Support for ST_Distance_Sphere()Anel Husakovic2021-03-271-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Cherry-pick 51e48b9f8981 - vscode gitignore - Thanks Robin Dupret for the review. Reviewed by:daniel@mariadb.org holyfoot@mariadb.com
* | | | | MDEV-22010: use executables MariaDB named in scriptsRucha Deodhar2021-06-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a part of this MDEV following changes were made: 1) Mariadb named executables used instead of mysql named executables in scripts 2) renamed mysql-test-run and mysql-stress-test to mariadb-test-run and mariadb-stress-test and created a symlink.
* | | | | MDEV-25857: MTR should report at least last test that was executed in case ↵Anel Husakovic2021-06-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of shutdown and not-completed - Report the test name in case not all tests are completed and server closed the connection - Rerport the failure of the last test with the server log in case of server shutdown. - Ignore stackdump files (obtained on Windows). Reviewed by: wlad@mariadb.com
* | | | | Merge 10.5 into 10.6Marko Mäkelä2021-06-011-5/+6
|\ \ \ \ \ | |/ / / /
| * | | | followup: rename generated files to have distinct namesSergei Golubchik2021-05-271-6/+6
| | | | |
| * | | | MDEV-25726 get rid of cmake comment hack in sql_yacc.yySergei Golubchik2021-05-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | and replace it with equally unsightly %ifdef/%endif hack also, support %else, it's nice
* | | | | MDEV-5536: add systemd socket activationDaniel Black2021-03-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Systemd has a socket activation feature where a mariadb.socket definition defines the sockets to listen to, and passes those file descriptors directly to mariadbd to use when a connection occurs. The new functionality is utilized when starting as follows: systemctl start mariadb.socket The mariadb.socket definition only needs to contain the network information, ListenStream= directives, the mariadb.service definition is still used for service instigation. When mariadbd is started in this way, the socket, port, bind-address backlog are all assumed to be self contained in the mariadb.socket definition and as such the mariadb settings and command line arguments of these network settings are ignored. See man systemd.socket for how to limit this to specific ports. Extra ports, those specified with extra_port in socket activation mode, are those with a FileDescriptorName=extra. These need to be in a separate service name like mariadb-extra.socket and these require a Service={mariadb.service} directive to map to the original service. Extra ports need systemd v227 or greater (not RHEL/Centos7 - v219) when FileDescriptorName= was added, otherwise the extra ports are treated like ordinary ports. The number of sockets isn't limited when using systemd socket activation (except by operating system limits on file descriptors and a minimal amount of memory used per file descriptor). The systemd sockets passed can include any ownership or permissions, including those the mariadbd process wouldn't normally have the permission to create. This implementation is compatible with mariadb.service definitions. Those services started with: systemctl start mariadb.service does actually start the mariadb.service and used all the my.cnf settings of sockets and ports like it previously did.
* | | | | Aria: Add transaction id to log of create tableMonty2021-03-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of a crash directly after a creation of an Aria table, Aria recovery would think that the table was from another system and require a repair of the table and inform that the table is 'zerofilled". This would cause no harm, but was confusing to see when testing atomic alter table. Fixed by logging the create transaction id to the log. Other things: - Added "show table status from sys" to maria_empy_logs. This ensures one does not get any zerofill warnings when sys/sys_config is used by other tests. - aria_chk --describe now prints a warning if the table was moved from another system. - Logging of truncate (maria_delete_all_rows) is changed to use the current trid for the create table. This is to ensure that we do not run into the same problem with truncate. - Changed back sys_config table to Aria as this patch should fix the "zerofill" problem in buildbot. - Added scripts/mysql_sys_schema.sql to .gitignore
* | | | | Merge 10.5 into 10.6Marko Mäkelä2020-11-021-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.4 into 10.5Marko Mäkelä2020-10-301-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.3 into 10.4Marko Mäkelä2020-10-291-0/+1
| | |\ \ \ | | | |/ /
| | | * | Merge 10.2 into 10.3Marko Mäkelä2020-10-281-0/+1
| | | |\ \ | | | | |/
| | | | * .gitignoreSergei Golubchik2020-10-231-0/+1
| | | | |
* | | | | Merge branch '10.5' into 10.6Vladislav Vaintroub2020-07-041-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | cmake: merge_static_libs - correct duplicate assumptions (#1583)Daniel Black2020-06-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This corrects build failures on ppc64{,le} with the WITH_EMBEDDED_SERVER option enabled. MDEV-22641 added an unusual case in which the same object file in was included twice with a different function defination. The original cmake/merge_archives_unix.cmake did not tolerate such eventualities. So we move to the highest voted answer on Stack Overflow for the merging of static libraries. https://stackoverflow.com/questions/3821916/how-to-merge-two-ar-static-libraries-into-one Thin archives generated compile failures and the libtool mechanism would of been another dependency and using .la files that isn't part of a normal cmake output. The straight Apple mechanism of libtool with static archives also failed on Linux. This leaves the MRI script mechansim which was implemented in this change.
| * | | | Don't include mysql-test/var* files in gitMonty2020-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | I constantly store temporary 'var' directories as var2, var3 for comparisons and having them in citool is annyoing
* | | | | MDEV-19780 Remove the TokuDB storage engineMarko Mäkelä2020-05-141-28/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TokuDB storage engine has been deprecated by upstream Percona Server 8.0 in favor of MyRocks and will not be available in subsequent major upstream releases. Let us remove it from MariaDB Server as well. MyRocks is actively maintained, and it can be used instead.
* | | | Ship mariadb.service and mysql[d].service symlinksVicențiu Ciorbaru2020-04-201-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create symlinks during configure time and install them. This is necessary as Alias support from systemd service file was dropped with: 6af0bd69074725c8d8b10f07ed4ccc013d010322 * Also ignore the generated symlinks in gitignore
* | | | MDEV-21303: Fix man page packaging for new mariadb-* named binariesOtto Kekäläinen2020-04-051-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes Lintian errors and warnings: E: mariadb-client-10.5: manpage-not-compressed usr/share/man/man1/mariadb-analyze.1 E: mariadb-client-10.5: manpage-not-compressed usr/share/man/man1/mariadb-optimize.1 E: mariadb-client-10.5: manpage-not-compressed usr/share/man/man1/mariadb-repair.1 E: mariadb-client-10.5: manpage-not-compressed usr/share/man/man1/mysqlanalyze.1 E: mariadb-client-10.5: manpage-not-compressed usr/share/man/man1/mysqloptimize.1 E: mariadb-client-10.5: manpage-not-compressed usr/share/man/man1/mysqlrepair.1 W: mariadb-client-10.5: binary-without-manpage usr/bin/mariadb-conv W: libmariadb-dev: binary-without-manpage usr/bin/mariadb_config If the binary name is mariadb_config, the manpage needs to be mariadb_config.1. Also run 'wrap-and-sort -a -v' to get lists in correct order. In addition, sort .gitignore and remove duplicate lines.
* | | | Ignore mariadb-config.1Monty2020-03-241-0/+1
| | | |
* | | | MDEV-22003 mysql_config disappeared from 10.5 (e.g. binary tarball or source ↵Sergei Golubchik2020-03-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | build) * generate and install mysql_config * symlink mariadb_config (from C/C) to mariadb-config also: * .gitignore generated mariadb-config.1 * remove obsolete compiler flag from C/C
* | | | perfschema compilation, test and misc fixesSergei Golubchik2020-03-101-0/+1
| | | |
* | | | Merge branch '10.4' into 10.5Oleksandr Byelkin2020-02-121-0/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '10.3' into 10.4Oleksandr Byelkin2020-02-111-0/+2
| |\ \ \ | | |/ /