mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
Merge with 4.0
BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c: Auto merged BitKeeper/deleted/.del-mysql.xdc: Delete: netware/mysql.xdc BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716: Auto merged BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e: Auto merged BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9: Auto merged client/mysql.cc: Auto merged include/my_pthread.h: Auto merged libmysqld/examples/Makefile.am: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/t/backup.test: Auto merged mysql-test/t/myisam.test: Auto merged mysys/default.c: Auto merged mysys/my_init.c: Auto merged mysys/my_pthread.c: Auto merged mysys/thr_mutex.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/ha_myisam.cc: Auto merged sql/log.cc: Auto merged sql-bench/crash-me.sh: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_show.cc: Auto merged strings/my_vsnprintf.c: Auto merged sql/sql_parse.cc: Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave) mysql-test/r/rpl_loaddata.result: Auto merged
This commit is contained in:
@@ -141,7 +141,13 @@ if [ $BASE_SYSTEM = "netware" ] ; then
|
||||
$CP -r netware/*.pl $BASE/scripts
|
||||
fi
|
||||
|
||||
for i in libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* libmysql/libmysqlclient.* libmysql_r/.libs/libmysqlclient_r.a libmysql_r/.libs/libmysqlclient_r.so* libmysql_r/libmysqlclient_r.* mysys/libmysys.a strings/libmystrings.a dbug/libdbug.a libmysqld/.libs/libmysqld.a libmysqld/.libs/libmysqld.so* libmysqld/libmysqld.a netware/libmysql.imp
|
||||
for i in \
|
||||
libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* \
|
||||
libmysql/libmysqlclient.* libmysql_r/.libs/libmysqlclient_r.a \
|
||||
libmysql_r/.libs/libmysqlclient_r.so* libmysql_r/libmysqlclient_r.* \
|
||||
mysys/libmysys.a strings/libmystrings.a dbug/libdbug.a \
|
||||
libmysqld/.libs/libmysqld.a libmysqld/.libs/libmysqld.so* \
|
||||
libmysqld/libmysqld.a netware/libmysql.imp
|
||||
do
|
||||
if [ -f $i ]
|
||||
then
|
||||
|
Reference in New Issue
Block a user