Below is the list of changes that have just been committed into a local
5.0 repository of mtaylor. When mtaylor does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-03-05 12:10:06+08:00, mtaylor@qualinost.(none) +49 -0
Fixed some syntax errors in the rules file.
Added files I missed before.
BitKeeper/deleted/.del-README.debian@stripped, 2007-03-05 12:01:10+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/README.debian
BitKeeper/deleted/.del-changelog@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/changelog
BitKeeper/deleted/.del-control@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/control
BitKeeper/deleted/.del-copyright@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/copyright
BitKeeper/deleted/.del-gomi@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/gomi
BitKeeper/deleted/.del-libmysqlclient10.dirs@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/libmysqlclient10.dirs
BitKeeper/deleted/.del-libmysqlclient10.postinst@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/libmysqlclient10.postinst
BitKeeper/deleted/.del-libmysqlclient9.dirs@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/libmysqlclient9.dirs
BitKeeper/deleted/.del-libmysqlclient9.postinst@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/libmysqlclient9.postinst
BitKeeper/deleted/.del-move@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/move
BitKeeper/deleted/.del-my.cnf@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/my.cnf
BitKeeper/deleted/.del-mysql-bench.dirs@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-bench.dirs
BitKeeper/deleted/.del-mysql-client.dirs@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-client.dirs
BitKeeper/deleted/.del-mysql-dev.dirs@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-dev.dirs
BitKeeper/deleted/.del-mysql-doc.dirs@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-doc.dirs
BitKeeper/deleted/.del-mysql-max-debug.dirs@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-max-debug.dirs
BitKeeper/deleted/.del-mysql-max-debug.postinst@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-max-debug.postinst
BitKeeper/deleted/.del-mysql-max-debug.postrm@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-max-debug.postrm
BitKeeper/deleted/.del-mysql-max-shared.dirs@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-max-shared.dirs
BitKeeper/deleted/.del-mysql-max-shared.postinst@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-max-shared.postinst
BitKeeper/deleted/.del-mysql-max-shared.postrm@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-max-shared.postrm
BitKeeper/deleted/.del-mysql-max.dirs@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-max.dirs
BitKeeper/deleted/.del-mysql-max.postinst@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-max.postinst
BitKeeper/deleted/.del-mysql-max.postrm@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-max.postrm
BitKeeper/deleted/.del-mysql-server-debug.dirs@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-server-debug.dirs
BitKeeper/deleted/.del-mysql-server-debug.postinst@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-server-debug.postinst
BitKeeper/deleted/.del-mysql-server-debug.postrm@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-server-debug.postrm
BitKeeper/deleted/.del-mysql-server-shared.dirs@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-server-shared.dirs
BitKeeper/deleted/.del-mysql-server-shared.postinst@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-server-shared.postinst
BitKeeper/deleted/.del-mysql-server-shared.postrm@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-server-shared.postrm
BitKeeper/deleted/.del-mysql-server.conffiles@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-server.conffiles
BitKeeper/deleted/.del-mysql-server.dirs@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-server.dirs
BitKeeper/deleted/.del-mysql-server.postinst@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-server.postinst
BitKeeper/deleted/.del-mysql-server.postrm@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-server.postrm
BitKeeper/deleted/.del-mysql-server.prerm@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/mysql-server.prerm
BitKeeper/deleted/.del-rules@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/rules
BitKeeper/deleted/.del-shlibs@stripped, 2007-03-05 12:01:11+08:00, mtaylor@qualinost.(none) +0 -0
Delete: support-files/debian/shlibs
debian/libndbclient2-dev.links@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +1 -0
Renamed added a few more files we need.
debian/libndbclient2-dev.links@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +0 -0
debian/libndbclient2.NEWS@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +14 -0
Renamed added a few more files we need.
debian/libndbclient2.NEWS@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +0 -0
debian/libndbclient2.README.Debian@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +30 -0
Renamed added a few more files we need.
debian/libndbclient2.README.Debian@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +0 -0
debian/mysql-common.files@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +2 -0
Renamed added a few more files we need.
debian/mysql-common.files@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +0 -0
debian/mysql-common.postrm@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +7 -0
Renamed added a few more files we need.
debian/mysql-common.postrm@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +0 -0
debian/mysql-common.preinst@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +215 -0
Renamed added a few more files we need.
debian/mysql-common.preinst@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +0 -0
debian/mysql-extra-5.0.dirs@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +1 -0
Renamed added a few more files we need.
debian/mysql-extra-5.0.dirs@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +0 -0
debian/mysql-extra-5.0.files@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +3 -0
Renamed added a few more files we need.
debian/mysql-extra-5.0.files@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +0 -0
debian/mysql-management-5.0.dirs@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +1 -0
Renamed added a few more files we need.
debian/mysql-management-5.0.dirs@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +0 -0
debian/mysql-management-5.0.files@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +1 -0
Renamed added a few more files we need.
debian/mysql-management-5.0.files@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +0 -0
debian/mysql-management-5.0.mysql-management.init@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +86 -0
Renamed added a few more files we need.
debian/mysql-management-5.0.mysql-management.init@stripped, 2007-03-05 12:10:04+08:00, mtaylor@qualinost.(none) +0 -0
debian/rules@stripped, 2007-03-05 12:10:03+08:00, mtaylor@qualinost.(none) +6 -5
Fixed some syntax errors in the rules file.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: mtaylor
# Host: qualinost.(none)
# Root: /home/mtaylor/src/mysql-5.0-debian
--- New file ---
+++ debian/libndbclient2-dev.links 07/03/05 12:10:04
usr/lib/libndbclient.so.2 usr/lib/libndbclient.so
--- New file ---
+++ debian/libndbclient2.NEWS 07/03/05 12:10:04
mysql-dfsg-5.0 (5.0.24-2) unstable; urgency=high
Self-build binaries which link against libmysqlclient15_5.0.24-1 MUST be
rebuild as there was an unintended ABI change again!
(Read /usr/share/doc/libmysqlclient15off/README.Debian)
-- Christian Hammers <ch@stripped> Fri, 25 Aug 2006 21:47:35 +0200
mysql-dfsg-5.0 (5.0.20-2) unstable; urgency=low
Self-build binaries which link against libmysqlclient15 MUST be rebuild!
(Read /usr/share/doc/libmysqlclient15off/README.Debian)
-- Christian Hammers <ch@stripped> Sat, 15 Apr 2006 13:05:22 +0200
--- New file ---
+++ debian/libndbclient2.README.Debian 07/03/05 12:10:04
* Crashs on systems with Cyrix or other old i486 CPUs
=====================================================
As reported http://bugs.mysql.com/bug.php?id=21765 MySQL will segfault on very
old CPUs that do not have support for the "cpuid" instruction.
* Self-build binaries that are linked against libmysqlclient15 MUST be rebuild!
===============================================================================
This only affects binaries that are build on a Debian unstable/testing system
before 2006-03-31 or version 5.0.19. "objdump -T myprogram | grep MYSQL_5.0"
will give a couple of lines output in such a case.
Until now libmysqlclient.so.15 had versioned symbols provided by a Debian
patch. Now MySQL finally decided to adopt this patch but sadly chosed a
different symbol name.
Binaries linked against the old version of the library with my symbol name will
not run with the new version with MySQL's symbol name ("version `MYSQL_5.0' not
found"). The actual name /usr/lib/libmysqlclient.so.15 must stay because else
binaries coming from systems other than Debian would never run on a Debian
server.
So the Debian package had to be renamed from "libmysqlclient15" to
"libmysqlclient15off" and do now conflict with their former version.
-- 2006-03-14, Christian Hammers <ch@stripped>
--- New file ---
+++ debian/mysql-common.files 07/03/05 12:10:04
etc/mysql/my.cnf
usr/share/mysql-common/internal-use-only
--- New file ---
+++ debian/mysql-common.postrm 07/03/05 12:10:04
#!/bin/bash
if [ "$1" = "purge" ]; then
rmdir /etc/mysql 2>/dev/null || true
fi
#DEBHELPER#
--- New file ---
+++ debian/mysql-common.preinst 07/03/05 12:10:04
#!/bin/bash -e
#
# summary of how this script can be called:
# * <new-preinst> install
# * <new-preinst> install <old-version>
# * <new-preinst> upgrade <old-version>
# * <old-preinst> abort-upgrade <new-version>
#
if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
# Try to stop the server in a sane way. If it does not success let the admin
# do it himself. No database directories should be removed while the server
# is running! Another mysqld in e.g. a different chroot is fine for us.
stop_server() {
if [ ! -x /etc/init.d/mysql ]; then return; fi
set +e
if [ -x /usr/sbin/invoke-rc.d ]; then
cmd="invoke-rc.d mysql stop"
else
cmd="/etc/init.d/mysql stop"
fi
$cmd
errno=$?
set -e
# 0=ok, 100=no init script (fresh install)
if [ "$errno" != 0 -a "$errno" != 100 ]; then
echo "${cmd/ */} returned $errno" 1>&2
echo "There is a MySQL server running, but we failed in our attempts to stop it." 1>&2
echo "Stop it yourself and try again!" 1>&2
exit 1
fi
}
start_server() {
if [ ! -x /etc/init.d/mysql ]; then return; fi
set +e
if [ -x /usr/sbin/invoke-rc.d ]; then
cmd="invoke-rc.d mysql start"
else
cmd="/etc/init.d/mysql start"
fi
$cmd
set -e
}
##### here's a bunch of helper functions for converting database formats ######
cvt_get_param(){
/usr/sbin/mysqld --print-defaults \
| tr " " "\n" \
| grep -- "--$1" \
| tail -n 1 \
| cut -d= -f2
}
cvt_setup_stuff(){
mytmp=`mktemp -d -t mysql-ISAM-convert.XXXXXX`
cvt_log="$mytmp/conversion.log"
if [ ! -d "$mytmp" ]; then
echo "can't create temporary directory, oh well." >&2
exit 1
fi
chgrp mysql $mytmp
chmod g+rwx $mytmp
cvt_socket=${mytmp}/mysql.sock
cvt_mysqld="mysqld --skip-grant-tables --skip-networking --socket $cvt_socket"
cvt_mysql="mysql --socket $cvt_socket"
cvt_mysqladmin="mysqladmin --socket $cvt_socket"
}
cvt_get_databases(){
echo fetching database list ... >&2
$cvt_mysql -e 'show databases' | sed -n -e '2,$p'
}
cvt_get_tables(){
echo querying tables in $1 ... >&2
$cvt_mysql $1 -e 'show table status' | sed -n -e '2,$p' | \
cut -f 1,2 | grep -w 'ISAM$' | cut -f 1
}
cvt_convert_table(){
echo converting $1.$2 ... >&2
$cvt_mysql $1 -e "alter table $2 type=MyISAM"
}
cvt_wait_for_server(){
local count
echo -n waiting for server startup.. >&2
while ! $cvt_mysql </dev/null >/dev/null 2>&1; do
echo -n . >&2
sleep 1
count=".$count"
if [ -f $mytmp/mysql.done ]; then
echo "sorry... looks like the server crashed :(" >&2
return 1
elif [ "$count" = "...................." ]; then
echo "sorry... looks like the server didn't start :(" >&2
return 1
fi
done
echo ok. >&2
}
cvt_wait_for_exit(){
local count
echo -n waiting for server shutdown.. >&2
while [ ! -f $mytmp/mysql.done ]; do
echo -n . >&2
sleep 1
count=".$count"
if [ "$count" = "...................." ]; then
echo "hrm... guess it never started?" >&2
return 0
fi
done
echo ok. >&2
}
cvt_cleanup(){
local mysql_kids
rm -rf $mytmp
# kill any mysqld child processes left over. there *shouldn't* be any,
# but let's not take chances with that
mysql_kids=`ps o 'pid command' --ppid $$ | grep -E '^[[:digit:]]+ mysqld ' | cut -d' ' -f1`
if [ "$mysql_kids" ]; then
echo "strange, some mysql processes left around. killing them now." >&2
kill $mysql_kids
sleep 10
mysql_kids=`ps o 'pid command' --ppid $$ | grep -E '^[[:digit:]]+ mysqld ' | cut -d' ' -f1`
if [ "$mysql_kids" ]; then
echo "okay, they're really not getting the hint..." >&2
kill -9 $mysql_kids
fi
fi
}
################################ main() ##########################
# test if upgrading from non conffile state
if [ "$1" = "upgrade" ] && [ -x /usr/sbin/mysqld ]; then
cvt_datadir=`cvt_get_param datadir`
# test for ISAM tables, which we must convert NOW
if [ -n "`find $cvt_datadir -name '*.ISM' 2>/dev/null`" ]; then
pidfile=`cvt_get_param pid-file`
if [ "$pidfile" ] && [ -f "$pidfile" ]; then
server_pid=`cat $pidfile`
if [ "$server_pid" ] && ps $server_pid >/dev/null 2>&1; then
server_running="yes"
fi
fi
# to be sure
stop_server
set +e
cat << EOF >&2
----------------------------------------
WARNING WARNING WARNING
----------------------------------------
It has been detected that are are using ISAM format on some of your
mysql database tables. This format has been deprecated and no longer
supported. to prevent these databases from essentially disappearing,
an attempt at format conversion will now be made. please check after
your upgrade that all tables are present and accounted for.
apologies for the noise, but we thought you'd appreciate it :)
----------------------------------------
WARNING WARNING WARNING
----------------------------------------
EOF
cvt_setup_stuff
($cvt_mysqld >$cvt_log 2>&1; touch $mytmp/mysql.done ) &
if cvt_wait_for_server; then
dbs=`cvt_get_databases`
for db in $dbs; do
tables=`cvt_get_tables $db`
for tbl in $tables; do
cvt_convert_table $db $tbl
done
done
else
cvt_error="yes"
fi
echo shutting down server... >&2
$cvt_mysqladmin shutdown
cvt_wait_for_exit
echo "all done!" >&2
if [ ! "$cvt_error" = "yes" ]; then
cvt_cleanup
else
echo "you might want to look in $mytmp..." >&2
fi
if [ "$server_running" ]; then
start_server
fi
set -e
fi
fi
exit 0
--- New file ---
+++ debian/mysql-extra-5.0.dirs 07/03/05 12:10:04
usr/bin
--- New file ---
+++ debian/mysql-extra-5.0.files 07/03/05 12:10:04
usr/bin/ndb_drop_index
usr/bin/ndb_drop_table
usr/bin/ndb_delete_all
--- New file ---
+++ debian/mysql-management-5.0.dirs 07/03/05 12:10:04
usr/sbin
--- New file ---
+++ debian/mysql-management-5.0.files 07/03/05 12:10:04
usr/sbin/ndb_mgmd
--- New file ---
+++ debian/mysql-management-5.0.mysql-management.init 07/03/05 12:10:04
#!/bin/bash
#
### BEGIN INIT INFO
# Provides: mysql-ndb-mgm
# Required-Start: $syslog
# Required-Stop: $syslog mysql
# Should-Start: $local_fs $remote_fs $network $named $time
# Should-Stop: $local_fs $remote_fs $network $named $time
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Start and stop the mysql database cluster management daemon
# Description: Controls the MySQL NDB Management Node daemon "ndb_mgmd".
### END INIT INFO
#
set -e
set -u
${DEBIAN_SCRIPT_DEBUG:+ set -v -x}
# Variables
SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
DAEMON=/usr/sbin/ndb_mgmd
CONF=/etc/mysql/ndb_mgmd.cnf
export HOME=/etc/mysql/
# Safeguard (relative paths, core dumps..)
cd /
umask 077
# Exit *silently* if we're not supposed to be started.
#
# The Debian scripts should execute these scripts to stop and start
# the daemon when upgrading if it is started. On the other hand it should
# remain silently if the server has not even been configured.
# See /usr/share/doc/mysql-server-*/README.Debian for more information.
test -x $DAEMON || exit 0
test -r $CONF || exit 0
. /lib/lsb/init-functions
#
# main()
#
case "${1:-''}" in
'start')
# Start daemon
log_daemon_msg "Starting MySQL NDB Management Node" "ndb_mgmd"
# --pid-file does not work as the daemon forks itself with $PID=$PID+1
if start-stop-daemon \
--start \
--exec $DAEMON \
--user mysql \
-- \
-f $CONF
then
log_end_msg 0
else
log_end_msg 1
log_warning_msg "Please take a look at the syslog."
exit 1
fi
;;
'stop')
log_daemon_msg "Stopping MySQL NDB Management Node" "ndb_mgmd"
if start-stop-daemon \
--stop \
--oknodo \
--exec $DAEMON
then
log_end_msg 0
else
log_end_msg 1
exit 1
fi
;;
'restart'|'force-reload')
set +e; $SELF stop; set -e
$SELF start
;;
*)
echo "Usage: $SELF start|stop|restart|force-reload"
exit 1
;;
esac
--- 1.1/debian/rules 2007-03-05 12:10:12 +08:00
+++ 1.2/debian/rules 2007-03-05 12:10:12 +08:00
@@ -48,10 +48,11 @@
# Are we not using these anymore?
# CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-DBIG_JOINS=1 -O2"} \
# CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-DBIG_JOINS=1 -felide-constructors -fno-rtti -O2"}
-export CC=$${MYSQL_BUILD_CC:-gcc}
-export CXX=$${MYSQL_BUILD_CXX:-gcc}
- sh -c '
- CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-DBIG_JOINS=1 -O2"} \
+
+ export CC=$${MYSQL_BUILD_CC:-gcc}
+ export CXX=$${MYSQL_BUILD_CXX:-gcc}
+ ./BUILD/autorun.sh
+ sh -c ' CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-DBIG_JOINS=1 -O2"} \
CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-DBIG_JOINS=1 -felide-constructors -fno-rtti -O2"} \
./configure \
$* \
@@ -206,7 +207,7 @@
# libmysqlclient: move shared libraries (but not the rest like libheap.a & co)
mv $(TMP)/usr/lib/mysql/libmysqlclient* $(TMP)/usr/lib
- mv $(TMP)/usr/lib/mysql/libndbclient* $(TMP)/usr/lib
+ mv $(TMP)/usr/lib/mysql/libndbclient* $(TMP)/usr/lib
perl -pi -e 's#/usr/lib/mysql#/usr/lib#' $(TMP)/usr/lib/libmysqlclient.la
perl -pi -e 's#/usr/lib/mysql#/usr/lib#' $(TMP)/usr/lib/libmysqlclient_r.la
perl -pi -e 's#/usr/lib/mysql#/usr/lib#' $(TMP)/usr/lib/libndbclient.la
| Thread |
|---|
| • bk commit into 5.0 tree (mtaylor:1.2460) | Monty Taylor | 5 Mar |
