diff options
author | unknown <monty@narttu.mysql.fi> | 2003-04-03 21:19:12 +0300 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2003-04-03 21:19:12 +0300 |
commit | 6c36f424281ed4354e7a20cb1798ebb6bd9393dc (patch) | |
tree | 2559697c56918e4fd2af81f84fcce0ea24dc60d4 /scripts | |
parent | f293e15fc9ff9a2861f19b83ea7886b32109da96 (diff) | |
parent | 3804913a5b727fe52da44627032af116c47af119 (diff) | |
download | mariadb-git-6c36f424281ed4354e7a20cb1798ebb6bd9393dc.tar.gz |
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
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/make_binary_distribution.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 52ea32c6d70..1731a7555e0 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -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 |