summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorvicentiu <vicentiu@mariadb.org>2017-01-06 17:09:59 +0200
committervicentiu <vicentiu@mariadb.org>2017-01-06 17:09:59 +0200
commite9aed131ead9e102c8948ebadc421960399722d4 (patch)
treeae8f4ee4ee7f7e915121ff2c73c88c20781c45ed /.gitignore
parente4978d26b79120c58706e57fc66e4de1ec4b230c (diff)
parentae1b3d1991b679bb38095711de27934d7683deda (diff)
downloadmariadb-git-e9aed131ead9e102c8948ebadc421960399722d4.tar.gz
Merge remote-tracking branch 'origin/5.5' into 10.0
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 433d14db7e9..0a7c6402d03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@ extra/jemalloc/build/
extra/jemalloc/tmp/
extra/my_print_defaults
extra/mysql_waitpid
+extra/mysqld_safe_helper
extra/perror
extra/replace
extra/resolve_stack_dump