diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 13:07:31 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 13:07:31 +0200 |
| commit | 4ec2e9d7eda78d409d1b017ef4d8928fe9055438 (patch) | |
| tree | 6c3a74a740d3c1c5f3a7d1f8154d8a791b435b3f /scripts | |
| parent | 1a2a9d74fe1256554eceb09bbc6752a6376df87d (diff) | |
| parent | 197bdbae4db78ba65f3668803bebd3c4a4509ae5 (diff) | |
| download | mariadb-git-4ec2e9d7eda78d409d1b017ef4d8928fe9055438.tar.gz | |
5.5 merge and fixes for compiler/test errors
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/make_win_bin_dist | 5 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index a6bf73ca0fe..2415d4017e4 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -158,11 +158,6 @@ for eng in $MARIA_BINARIES ; do cp storage/maria/$TARGET/$eng.{exe,pdb} $DESTDIR/bin done -# PBXT -if [ -f "storage/pbxt/bin/xtstat.exe" ] ; then - cp storage/pbxt/bin/xtstat.{exe,pdb} $DESTDIR/bin -fi - if [ x"$TARGET" != x"release" ] ; then cp client/$TARGET/mysql.pdb $DESTDIR/bin/ cp client/$TARGET/mysqladmin.pdb $DESTDIR/bin/ diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 0f6eebf626e..1870dc8b32f 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -417,7 +417,7 @@ mysqld_install_cmd_line() { "$mysqld_bootstrap" $defaults "$mysqld_opt" --bootstrap \ "--basedir=$basedir" "--datadir=$ldata" --log-warnings=0 \ - --loose-skip-ndbcluster --loose-skip-pbxt $args --max_allowed_packet=8M \ + --loose-skip-ndbcluster $args --max_allowed_packet=8M \ --net_buffer_length=16K } |