diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-01 11:39:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-01 11:39:38 +0300 |
| commit | a722ee88f33296eee6a72855570677c48dce7ebf (patch) | |
| tree | 128ce4696a80fd953836b4a9eed20ab8afc4e61c /.gitignore | |
| parent | 5727d56260e66d9b9f2dee6783385c5928d4f3a3 (diff) | |
| parent | 9c7a456a92262bdb44b85a05aa9f87369c5b063c (diff) | |
| download | mariadb-git-a722ee88f33296eee6a72855570677c48dce7ebf.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 4fee2deaea5..2cf801d6290 100644 --- a/.gitignore +++ b/.gitignore @@ -197,11 +197,12 @@ sql/lex_hash.h sql/mysql_tzinfo_to_sql sql/mysqld sql/sql_builtin.cc -sql/sql_yacc.cc -sql/sql_yacc.hh -sql/sql_yacc_ora.cc -sql/sql_yacc_ora.hh -sql/sql_yacc_ora.yy +sql/yy_mariadb.cc +sql/yy_mariadb.hh +sql/yy_mariadb.yy +sql/yy_oracle.cc +sql/yy_oracle.hh +sql/yy_oracle.yy storage/heap/hp_test1 storage/heap/hp_test2 storage/maria/aria_chk |