Commit 3911c810 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

merged

parents 9ec4ca9c 91e84fc8
Loading
Loading
Loading
Loading
+17 −12
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@
*.la
*.lo
*.o
*.reject
*.spec
*/*_pure_*warnings
*/.pure
@@ -152,6 +153,8 @@ client/mysqlbinlog
client/mysqlcheck
client/mysqldump
client/mysqlimport
client/mysqlmanager-pwgen
client/mysqlmanagerc
client/mysqlshow
client/mysqltest
client/mysys_priv.h
@@ -203,6 +206,17 @@ libmysqld/backup_dir
libmysqld/convert.cc
libmysqld/derror.cc
libmysqld/errmsg.c
libmysqld/examples/completion_hash.cc
libmysqld/examples/completion_hash.h
libmysqld/examples/my_readline.h
libmysqld/examples/mysql
libmysqld/examples/mysql.cc
libmysqld/examples/mysqltest
libmysqld/examples/mysqltest.c
libmysqld/examples/readline.cc
libmysqld/examples/sql_string.cc
libmysqld/examples/sql_string.h
libmysqld/examples/test-gdbinit
libmysqld/field.cc
libmysqld/field_conv.cc
libmysqld/filesort.cc
@@ -288,6 +302,8 @@ linked_libmysqldex_sources
linked_server_sources
linked_tools_sources
locked
myisam/FT1.MYD
myisam/FT1.MYI
myisam/ft_dump
myisam/ft_eval
myisam/ft_test1
@@ -326,6 +342,7 @@ scripts/make_binary_distribution
scripts/msql2mysql
scripts/mysql_config
scripts/mysql_convert_table_format
scripts/mysql_explain_log
scripts/mysql_find_rows
scripts/mysql_fix_privilege_tables
scripts/mysql_install_db
@@ -402,15 +419,3 @@ vio/test-ssl
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
libmysqld/examples/completion_hash.cc
libmysqld/examples/completion_hash.h
libmysqld/examples/my_readline.h
libmysqld/examples/mysql.cc
libmysqld/examples/mysqltest.c
libmysqld/examples/readline.cc
libmysqld/examples/sql_string.cc
libmysqld/examples/sql_string.h
libmysqld/examples/mysql
libmysqld/examples/mysqltest
myisam/FT1.MYD
myisam/FT1.MYI
+13 −0
Original line number Diff line number Diff line
gmake -k clean || true 
/bin/rm -f */.deps/*.P config.cache

aclocal && autoheader && aclocal && automake && autoconf
(cd bdb/dist && sh s_all)
(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
if [ -d gemini ]
then
   (cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
fi

CC=ecc CFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" CXX=ecc CXXFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static  --with-client-ldflags=-all-static  --with-debug --with-innodb --with-embedded-server
gmake
+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ extra_configs="$pentium_configs"
strip=yes

extra_configs="$extra_configs --with-innodb --with-berkeley-db \
 --enable-thread-safe-client"
 --enable-thread-safe-client --with-openssl --with-vio"

. "$path/FINISH.sh"
+3 −0
Original line number Diff line number Diff line
Administrator@fred.
Miguel@light.local
Sinisa@sinisa.nasamreza.org
davida@isil.mysql.com
heikki@donna.mysql.fi
@@ -26,5 +28,6 @@ tim@threads.polyesthetic.msg
tim@white.box
tim@work.mysql.com
tonu@hundin.mysql.fi
tonu@volk.internalnet
tonu@x153.internalnet
tonu@x3.internalnet
+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ aclocal; autoheader; aclocal; automake; autoconf
 --enable-thread-safe-client \
 --with-berkeley-db \
 --with-innodb \
 --with-vio \
 --without-pstack \
 --with-extra-tools \
 --with-embedded-server
Loading