mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1
BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged BUILD/FINISH.sh: Auto merged BUILD/compile-dist: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged storage/ndb/src/cw/cpcd/Process.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Auto merged storage/ndb/src/kernel/error/ErrorReporter.cpp: Auto merged storage/ndb/src/ndbapi/Ndb.cpp: Auto merged
This commit is contained in:
commit
14b614e164
83 changed files with 813 additions and 432 deletions
|
|
@ -2,12 +2,6 @@ cflags="$c_warnings $extra_flags"
|
|||
cxxflags="$cxx_warnings $base_cxxflags $extra_flags"
|
||||
extra_configs="$extra_configs $local_infile_configs"
|
||||
configure="./configure $base_configs $extra_configs"
|
||||
for arg
|
||||
do
|
||||
# Escape special characters so they don't confuse eval
|
||||
configure="$configure "`echo "$arg" | \
|
||||
sed -e 's,\([^a-zA-Z0-9_.=-]\),\\\\\1,g'`
|
||||
done
|
||||
|
||||
commands="\
|
||||
$make -k distclean || true
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue