summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BUILD/FINISH.sh4
-rwxr-xr-xBUILD/SETUP.sh2
-rw-r--r--mysql-test/valgrind.supp2
3 files changed, 3 insertions, 5 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh
index 86085fcc593..b41c5c5139d 100644
--- a/BUILD/FINISH.sh
+++ b/BUILD/FINISH.sh
@@ -32,9 +32,9 @@ then
configure="$configure --verbose"
fi
+# git clean -fdX removes all ignored (build) files
commands="\
-/bin/rm -rf configure;
-/bin/rm -rf CMakeCache.txt CMakeFiles/
+git clean -fdX
path=`dirname $0`
. \"$path/autorun.sh\""
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index d25b9d9d891..22357ce7fc8 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -42,7 +42,7 @@ Usage: $0 [-h|-n] [configure-options]
Influences the debug flags. Old is default.
--prefix=path Build with prefix 'path'.
-Note: this script is intended for internal use by MySQL developers.
+Note: this script is intended for internal use by MariaDB developers.
EOF
}
diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
index 76c848dddad..20d4b124dd7 100644
--- a/mysql-test/valgrind.supp
+++ b/mysql-test/valgrind.supp
@@ -368,8 +368,6 @@
fun:_dl_init
}
-
-
#
# dlclose can allocate memory for error message, the memory will be
# freed by dlerror or other dl* function.