1 files changed, 23 insertions, 21 deletions
diff --git a/.gitignore b/.gitignore
index 40941e487a7..ce36734fa46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ client/mysqlimport
 client/mysqlshow
 client/mysqlslap
 client/mysqltest
+client/mariadb-conv
 cmake_install.cmake
 dbug/*.r
 dbug/factorial
@@ -96,12 +97,7 @@ mysys/thr_timer
 packaging/rpm-oel/mysql.spec
 packaging/rpm-uln/mysql.10.0.11.spec
 packaging/solaris/postinstall-solaris
-pcre/config.h
-pcre/pcre.h
-pcre/pcre_chartables.c
-pcre/pcregrep
-pcre/pcretest
-pcre/test*grep
+extra/pcre2
 plugin/auth_pam/auth_pam_tool
 plugin/aws_key_management/aws-sdk-cpp
 plugin/aws_key_management/aws_sdk_cpp
@@ -201,6 +197,7 @@ sql/sql_yacc.cc
 sql/sql_yacc.hh
 sql/sql_yacc_ora.cc
 sql/sql_yacc_ora.hh
+sql/sql_yacc_ora.yy
 storage/heap/hp_test1
 storage/heap/hp_test2
 storage/maria/aria_chk
@@ -208,6 +205,7 @@ storage/maria/aria_dump_log
 storage/maria/aria_ftdump
 storage/maria/aria_pack
 storage/maria/aria_read_log
+storage/maria/aria_s3_copy
 storage/maria/ma_rt_test
 storage/maria/ma_sp_test
 storage/maria/ma_test1
@@ -223,6 +221,7 @@ storage/myisam/myisamlog
 storage/myisam/myisampack
 storage/myisam/rt_test
 storage/myisam/sp_test
+storage/perfschema/pfs_config.h
 storage/rocksdb/ldb
 storage/rocksdb/myrocks_hotbackup
 storage/rocksdb/mysql_ldb
@@ -264,8 +263,9 @@ support-files/config.huge.ini
 support-files/config.medium.ini
 support-files/config.small.ini
 support-files/mariadb.pc
-support-files/mariadb@.service
+support-files/mariadb.pp
 support-files/mariadb.service
+support-files/mariadb@.service
 support-files/my-huge.cnf
 support-files/my-innodb-heavy-4G.cnf
 support-files/my-large.cnf
@@ -274,14 +274,15 @@ support-files/my-small.cnf
 support-files/mysql-log-rotate
 support-files/mysql.10.0.11.spec
 support-files/mysql.server
+support-files/mysql.service
 support-files/mysql.spec
+support-files/mysqld.service
 support-files/mysqld_multi.server
-support-files/wsrep.cnf
-support-files/wsrep_notify
 support-files/policy/selinux/mysqld-safe.pp
 support-files/sysusers.conf
 support-files/tmpfiles.conf
-support-files/mariadb.pp
+support-files/wsrep.cnf
+support-files/wsrep_notify
 tags
 tests/async_queries
 tests/bug25714
@@ -568,19 +569,25 @@ client/mariadb-slap
 client/mariadb-test
 client/mariadb-upgrade
 extra/mariabackup/mariadb-backup
-extra/mariadb-waitpid
 extra/mariadbd-safe-helper
+extra/mariadb-waitpid
 libmysqld/examples/mariadb-client-test-embedded
 libmysqld/examples/mariadb-embedded
 libmysqld/examples/mariadb-test-embedded
+man/mariadb.1
 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-client-test-embedded.1
+man/mariadb_config.1
 man/mariadb-convert-table-format.1
+man/mariadbd.8
+man/mariadbd-multi.1
+man/mariadbd-safe.1
+man/mariadbd-safe-helper.1
 man/mariadb-dump.1
 man/mariadb-dumpslow.1
 man/mariadb-embedded.1
@@ -595,18 +602,15 @@ 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-test-embedded.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/mariadbd-multi
+scripts/mariadbd-safe
 scripts/mariadb-dumpslow
 scripts/mariadb-find-rows
 scripts/mariadb-fix-extensions
@@ -614,10 +618,8 @@ 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
+sql/mariadb-tzinfo-to-sql
 storage/rocksdb/mariadb-ldb
 tests/mariadb-client-test
 versioninfo_dll.rc