1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00

Merge branch 'develop-1.2' into develop-merge-up-20190514

This commit is contained in:
Andrew Hutchings
2019-05-14 13:58:33 +01:00
83 changed files with 469 additions and 638 deletions

View File

@ -5,10 +5,10 @@
set +e; \
if [ -f dml-scan.cpp ]; \
then diff -abBq dml-scan-temp.cpp dml-scan.cpp >/dev/null 2>&1; \
if [ $$? -ne 0 ]; \
if [ $? -ne 0 ]; \
then mv -f dml-scan-temp.cpp dml-scan.cpp; \
else touch dml-scan.cpp; \
fi; \
else mv -f dml-scan-temp.cpp dml-scan.cpp; \
fi
rm -f dml-scan-temp.cpp
rm -f dml-scan-temp.cpp