diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-18 11:30:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-18 11:30:06 +0300 |
| commit | 3c88ce4cd112f696002d5f7461db68a3dafeb838 (patch) | |
| tree | 8860f823877b8d816fbca45d9e6926bcbc8f012d /.gitignore | |
| parent | 44d06cd39df2bdde6f7ac31d5340f1f683683c99 (diff) | |
| parent | e85e4814eeca9123b23c23b40dd776416bfba2ca (diff) | |
| download | mariadb-git-3c88ce4cd112f696002d5f7461db68a3dafeb838.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 1739c9361d6..e0068c8f75f 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,7 @@ extra/perror extra/replace extra/resolve_stack_dump extra/resolveip +extra/wolfssl/user_settings.h import_executables.cmake include/*.h.tmp include/config.h @@ -524,3 +525,67 @@ compile_commands.json # Clion && other JetBrains ides .idea +client/mariadb +client/mariadb-admin +client/mariadb-binlog +client/mariadb-check +client/mariadb-dump +client/mariadb-import +client/mariadb-plugin +client/mariadb-show +client/mariadb-slap +client/mariadb-test +client/mariadb-upgrade +extra/mariabackup/mariadb-backup +extra/mariadb-waitpid +extra/mariadbd-safe-helper +libmysqld/examples/mariadb-client-test-embedded +libmysqld/examples/mariadb-embedded +libmysqld/examples/mariadb-test-embedded +man/mariadb-access.1 +man/mariadb-admin.1 +man/mariadb-backup.1 +man/mariadb-binlog.1 +man/mariadb-check.1 +man/mariadb-client-test-embedded.1 +man/mariadb-client-test.1 +man/mariadb-convert-table-format.1 +man/mariadb-dump.1 +man/mariadb-dumpslow.1 +man/mariadb-embedded.1 +man/mariadb-find-rows.1 +man/mariadb-fix-extensions.1 +man/mariadb-hotcopy.1 +man/mariadb-import.1 +man/mariadb-install-db.1 +man/mariadb-ldb.1 +man/mariadb-plugin.1 +man/mariadb-secure-installation.1 +man/mariadb-setpermission.1 +man/mariadb-show.1 +man/mariadb-slap.1 +man/mariadb-test-embedded.1 +man/mariadb-test.1 +man/mariadb-tzinfo-to-sql.1 +man/mariadb-upgrade.1 +man/mariadb-waitpid.1 +man/mariadb.1 +man/mariadbd-multi.1 +man/mariadbd-safe-helper.1 +man/mariadbd-safe.1 +man/mariadbd.8 +scripts/mariadb-access +scripts/mariadb-convert-table-format +scripts/mariadb-dumpslow +scripts/mariadb-find-rows +scripts/mariadb-fix-extensions +scripts/mariadb-hotcopy +scripts/mariadb-install-db +scripts/mariadb-secure-installation +scripts/mariadb-setpermission +scripts/mariadbd-multi +scripts/mariadbd-safe +sql/mariadb-tzinfo-to-sql +sql/mariadbd +storage/rocksdb/mariadb-ldb +tests/mariadb-client-test |