summaryrefslogtreecommitdiff
path: root/.gitignore
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2020-01-311-0/+2
| | |\ \ | | | |/
| | | * Merge 10.1 into 10.2Marko Mäkelä2020-01-311-0/+2
| | | |\
| | | | * Ingore sysusers and tmpfiles artifactsVicențiu Ciorbaru2020-01-281-0/+2
| | | | |
| | | * | Fixed dependency checking in some Galera testsJulius Goryavsky2019-07-181-0/+1
| | | | |
| | * | | wsrep_check_version binary is added to .gitignoreJulius Goryavsky2019-07-181-0/+1
| | | | |
* | | | | remove pcre, add support for bundled pcre2Sergei Golubchik2019-12-211-6/+1
| | | | |
* | | | | Merge 10.4 into 10.5Marko Mäkelä2019-12-161-0/+32
|\ \ \ \ \ | |/ / / /
| * | | | git ignore generated stuffVladislav Vaintroub2019-12-121-0/+32
| | | | |
* | | | | Part2: MDEV-12518 Unify sql_yacc.yy and sql_yacc_ora.yyVladislav Vaintroub2019-12-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Generate sql_yacc_ora.yy from sql_yacc.yy , by using cmake script which does some simple string(REPLACE)
* | | | | MDEV-17088 Provide tools to encode/decode mysql-encoded file system namesAlexander Barkov2019-11-281-0/+1
| | | | | | | | | | | | | | | | | | | | The original patch was made by Takashi Sasaki <tsasaki609@gmail.com>.
* | | | | Merge 10.4 into 10.5Marko Mäkelä2019-08-131-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fixed that mariadb-# binaries reads their corresponding entry from my.cnfMonty2019-07-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added mariadb-# to load_default_groups to all mariadb-# scripts and mariadb-binaries. - Added mariadbd and mariadbd-"version" to load_default_groups for the mysqld/mariadb server - Added mariadb-client to load_default_groups for the mysql/mariadb client Other things - Ignored mysql-test/lib/My/SafeProcess/wsrep_check_version - mysql_install_db will now automatically detect if run from srcdir
* | | | | Merge 10.4 into 10.5Marko Mäkelä2019-06-181-0/+65
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-17592 Create MariaDB named commands/symlinksSergei Golubchik2019-06-171-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | post-merge fixes: * .gitignore * don't put the keyword COMPONENT into ${COMP} anymore * don't alias mytop, but do alias mysql_client_test * don't symlink manpages, use troff aliasing technique instead (symlinked manpages break rpm and out-of-source bintar builds) * move debian to use troff aliased manpages, fix typos in debian files, put aliases in the correct packages, add more aliases to match rpm/bintar packaging
| * | | | Use generated user_settings.h for WolfSSL, as recommended by WolfSSLVladislav Vaintroub2019-06-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentation Apparently, WolfSSL wants to have *exactly* the same defines for the user of the library as the was when building library itself. A lot of #defines have an impact on ABI (structure sizes, alignment etc)
* | | | | MDEV-17841 S3 storage engineMonty2019-05-231-0/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A read-only storage engine that stores it's data in (aws) S3 To store data in S3 one could use ALTER TABLE: ALTER TABLE table_name ENGINE=S3 libmarias3 integration done by Sergei Golubchik libmarias3 created by Andrew Hutchings
* | | | Add Clion folder to gitignore (#928)Andrey2019-03-231-0/+4
| | | |
* | | | Merge 10.3 into 10.4Marko Mäkelä2019-03-201-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MDEV-17262 commit 26432e49d37a37d09b862bb49a021e44bdf4789c was skipped. In Galera 4, the implementation would seem to require changes to the streaming replication. In the tests archive.rnd_pos main.profiling, disable_ps_protocol for SHOW STATUS and SHOW PROFILE commands until MDEV-18974 has been fixed.
| * | | Ignore VScode workspaceAnel Husakovic2019-03-131-0/+3
| | | |
* | | | Merge 10.3 into 10.4Marko Mäkelä2019-03-061-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into 10.3Marko Mäkelä2019-03-041-1/+1
| |\ \ \ | | |/ /