diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-16 07:47:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-16 07:47:17 +0200 |
| commit | 28c89b7151bc3ebd7a3459e85f4c9b5e73529629 (patch) | |
| tree | ce50324e5d1054f59a7178bfdb426189998baf52 /.gitignore | |
| parent | 745fd4b39f8aff6300682502ed2ddf61ee343866 (diff) | |
| parent | 8fa759a5762733d9f8a4050437fadcd255ecd1a2 (diff) | |
| download | mariadb-git-28c89b7151bc3ebd7a3459e85f4c9b5e73529629.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 42f654b5c6d..2633d475887 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ *.ninja .ninja_* .gdb_history +.vs/ errmsg.sys typescript _CPack_Packages @@ -138,6 +139,10 @@ scripts/maria_add_gis_sp.sql scripts/maria_add_gis_sp_bootstrap.sql scripts/galera_new_cluster scripts/galera_recovery +scripts/mysql_convert_table_format.pl +scripts/mysqld_multi.pl +scripts/mysqldumpslow.pl +scripts/mysqlhotcopy.pl sql-bench/bench-count-distinct sql-bench/bench-init.pl sql-bench/compare-results @@ -162,6 +167,30 @@ sql-bench/test-select sql-bench/test-table-elimination sql-bench/test-transactions sql-bench/test-wisconsin +sql-bench/bench-count-distinct.pl +sql-bench/compare-results.pl +sql-bench/copy-db.pl +sql-bench/crash-me.pl +sql-bench/graph-compare-results.pl +sql-bench/innotest1.pl +sql-bench/innotest1a.pl +sql-bench/innotest1b.pl +sql-bench/innotest2.pl +sql-bench/innotest2a.pl +sql-bench/innotest2b.pl +sql-bench/run-all-tests.pl +sql-bench/server-cfg.pl +sql-bench/test-ATIS.pl +sql-bench/test-alter-table.pl +sql-bench/test-big-tables.pl +sql-bench/test-connect.pl +sql-bench/test-create.pl +sql-bench/test-insert.pl +sql-bench/test-select.pl +sql-bench/test-table-elimination.pl +sql-bench/test-transactions.pl +sql-bench/test-wisconsin.pl +sql/make_mysqld_lib.cmake sql/lex_token.h sql/gen_lex_token sql/gen_lex_hash @@ -592,3 +621,6 @@ sql/mariadb-tzinfo-to-sql sql/mariadbd storage/rocksdb/mariadb-ldb tests/mariadb-client-test +versioninfo_dll.rc +versioninfo_exe.rc +win/packaging/ca/symlinks.cc |