mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
merge
BitKeeper/etc/logging_ok: auto-union Build-tools/Do-all-build-steps: Auto merged Build-tools/Do-compile: Auto merged Build-tools/Do-rpm: Auto merged Docs/manual.texi: Auto merged include/hash.h: Auto merged include/my_sys.h: Auto merged innobase/dict/dict0dict.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysys/array.c: Auto merged mysys/hash.c: Auto merged mysys/mf_qsort.c: Auto merged sql/sql_base.cc: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged strings/Makefile.am: Auto merged support-files/mysql.spec.sh: Auto merged
This commit is contained in:
@ -79,8 +79,10 @@ sleep_until_file_created ()
|
||||
|
||||
# No paths below as we can't be sure where the program is!
|
||||
|
||||
BASENAME=`which basename | head -1`
|
||||
DIFF=`which diff | head -1`
|
||||
SED=sed
|
||||
|
||||
BASENAME=`which basename | $SED q`
|
||||
DIFF=`which diff | $SED q`
|
||||
CAT=cat
|
||||
CUT=cut
|
||||
HEAD=head
|
||||
@ -88,13 +90,12 @@ TAIL=tail
|
||||
ECHO=echo # use internal echo if possible
|
||||
EXPR=expr # use internal if possible
|
||||
FIND=find
|
||||
GCOV=`which gcov | head -1`
|
||||
GCOV=`which gcov | $SED q`
|
||||
PRINTF=printf
|
||||
RM=rm
|
||||
TIME=time
|
||||
TR=tr
|
||||
XARGS=`which xargs | head -1`
|
||||
SED=sed
|
||||
XARGS=`which xargs | $SED q`
|
||||
|
||||
# Are we using a source or a binary distribution?
|
||||
|
||||
|
Reference in New Issue
Block a user