Below is the list of changes that have just been committed into a local
5.1 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, 2008-04-23 17:03:20-07:00, mtaylor@solace.(none) +44 -0
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
BUILD/autorun.sh@stripped, 2008-04-23 17:03:12-07:00, mtaylor@solace.(none) +1 -1
Turned off warnings about non-gnu make portability, since we don't support non-gnu make anyway.
BitKeeper/etc/ignore@stripped, 2008-04-23 17:03:12-07:00, mtaylor@solace.(none) +11 -0
Added mysys/tests/test_base64 mysys/tests/test_bitmap mysys/tests/test_gethwaddr mysys/tests/test_io_cache mysys/tests/test_priority_queue mysys/tests/test_thr_alarm mysys/tests/test_thr_lock mysys/tests/test_vsnprintf mysys/tests/testhash mysys/tests/.deps/test_charset.Tpo mysys/tests/.deps/test_dir.Tpo to the ignore list
Makefile.am@stripped, 2008-04-23 17:03:12-07:00, mtaylor@solace.(none) +1 -1
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
client/Makefile.am@stripped, 2008-04-23 17:03:12-07:00, mtaylor@solace.(none) +3 -2
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
config/ac-macros/zlib.m4@stripped, 2008-04-23 17:03:13-07:00, mtaylor@solace.(none) +0 -1
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
configure.in@stripped, 2008-04-23 17:03:12-07:00, mtaylor@solace.(none) +25 -4
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
dbug/Makefile.am@stripped, 2008-04-23 17:03:13-07:00, mtaylor@solace.(none) +4 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
extra/Makefile.am@stripped, 2008-04-23 17:03:13-07:00, mtaylor@solace.(none) +4 -2
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
libmysql/Makefile.am@stripped, 2008-04-23 17:03:13-07:00, mtaylor@solace.(none) +1 -1
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
libmysql_r/Makefile.am@stripped, 2008-04-23 17:03:13-07:00, mtaylor@solace.(none) +1 -1
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
libmysqld/Makefile.am@stripped, 2008-04-23 17:03:13-07:00, mtaylor@solace.(none) +3 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
mysys/Makefile.am@stripped, 2008-04-23 17:03:13-07:00, mtaylor@solace.(none) +9 -66
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
mysys/my_bitmap.c@stripped, 2008-04-23 17:03:14-07:00, mtaylor@solace.(none) +10 -10
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
mysys/queues.c@stripped, 2008-04-23 17:03:14-07:00, mtaylor@solace.(none) +7 -7
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
mysys/tests/Makefile.am@stripped, 2008-04-23 17:03:18-07:00, mtaylor@solace.(none) +52 -0
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
mysys/tests/Makefile.am@stripped, 2008-04-23 17:03:18-07:00, mtaylor@solace.(none) +0 -0
mysys/tests/test_charset.c@stripped, 2008-04-23 17:02:42-07:00, mtaylor@solace.(none) +0 -0
Rename: mysys/test_charset.c -> mysys/tests/test_charset.c
mysys/tests/test_dir.c@stripped, 2008-04-23 17:02:42-07:00, mtaylor@solace.(none) +0 -0
Rename: mysys/test_dir.c -> mysys/tests/test_dir.c
mysys/tests/testhash.c@stripped, 2008-04-23 17:02:42-07:00, mtaylor@solace.(none) +0 -0
Rename: mysys/testhash.c -> mysys/tests/testhash.c
netware/Makefile.am@stripped, 2008-04-23 17:03:14-07:00, mtaylor@solace.(none) +5 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
regex/Makefile.am@stripped, 2008-04-23 17:03:14-07:00, mtaylor@solace.(none) +1 -1
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
server-tools/instance-manager/Makefile.am@stripped, 2008-04-23 17:03:14-07:00, mtaylor@solace.(none) +3 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
sql/Makefile.am@stripped, 2008-04-23 17:03:14-07:00, mtaylor@solace.(none) +4 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/archive/Makefile.am@stripped, 2008-04-23 17:03:14-07:00, mtaylor@solace.(none) +6 -6
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/heap/Makefile.am@stripped, 2008-04-23 17:03:14-07:00, mtaylor@solace.(none) +6 -6
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/myisam/Makefile.am@stripped, 2008-04-23 17:03:15-07:00, mtaylor@solace.(none) +27 -27
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/ndb/config/type_ndbapitest.mk.am@stripped, 2008-04-23 17:03:15-07:00, mtaylor@solace.(none) +3 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/ndb/config/type_ndbapitools.mk.am@stripped, 2008-04-23 17:03:15-07:00, mtaylor@solace.(none) +3 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/ndb/src/Makefile.am@stripped, 2008-04-23 17:03:15-07:00, mtaylor@solace.(none) +4 -1
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/ndb/src/common/util/Makefile.am@stripped, 2008-04-23 17:03:15-07:00, mtaylor@solace.(none) +3 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/ndb/src/cw/cpcd/Makefile.am@stripped, 2008-04-23 17:03:15-07:00, mtaylor@solace.(none) +3 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/ndb/src/kernel/Makefile.am@stripped, 2008-04-23 17:03:15-07:00, mtaylor@solace.(none) +4 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/ndb/src/kernel/blocks/Makefile.am@stripped, 2008-04-23 17:03:16-07:00, mtaylor@solace.(none) +3 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/ndb/src/kernel/blocks/backup/Makefile.am@stripped, 2008-04-23 17:03:16-07:00, mtaylor@solace.(none) +3 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/ndb/src/kernel/blocks/dbdict/Makefile.am@stripped, 2008-04-23 17:03:17-07:00, mtaylor@solace.(none) +6 -6
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/ndb/src/kernel/blocks/dbdih/Makefile.am@stripped, 2008-04-23 17:03:17-07:00, mtaylor@solace.(none) +3 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/ndb/src/kernel/blocks/dblqh/Makefile.am@stripped, 2008-04-23 17:03:17-07:00, mtaylor@solace.(none) +3 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/ndb/src/kernel/blocks/dbtup/Makefile.am@stripped, 2008-04-23 17:03:17-07:00, mtaylor@solace.(none) +3 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/ndb/src/kernel/vm/Makefile.am@stripped, 2008-04-23 17:03:17-07:00, mtaylor@solace.(none) +9 -9
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/ndb/src/mgmclient/Makefile.am@stripped, 2008-04-23 17:03:17-07:00, mtaylor@solace.(none) +3 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/ndb/src/mgmsrv/Makefile.am@stripped, 2008-04-23 17:03:18-07:00, mtaylor@solace.(none) +3 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/ndb/src/ndbapi/Makefile.am@stripped, 2008-04-23 17:03:18-07:00, mtaylor@solace.(none) +4 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
storage/ndb/test/run-test/Makefile.am@stripped, 2008-04-23 17:03:18-07:00, mtaylor@solace.(none) +3 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
strings/Makefile.am@stripped, 2008-04-23 17:03:18-07:00, mtaylor@solace.(none) +9 -9
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
unittest/mysys/Makefile.am@stripped, 2008-04-23 17:03:18-07:00, mtaylor@solace.(none) +4 -3
BUG#29791 relocation R_X86_64_32 against `a local symbol'
Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool
helper libs. The will no longer be installed, and all of the necessary symbols
from them are added directly to libndbclient et al. The upside here is that
NDB API programs now only need to link against -lndbclient.
diff -Nrup a/BUILD/autorun.sh b/BUILD/autorun.sh
--- a/BUILD/autorun.sh 2007-10-29 14:48:18 -07:00
+++ b/BUILD/autorun.sh 2008-04-23 17:03:12 -07:00
@@ -27,5 +27,5 @@ $LIBTOOLIZE --automake --force --copy ||
# --add-missing instructs automake to install missing auxiliary files
# and --force to overwrite them if they already exist
-automake --add-missing --force --copy || die "Can't execute automake"
+automake --add-missing --force --copy --gnu -W no-portability || die "Can't execute automake"
autoconf || die "Can't execute autoconf"
diff -Nrup a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
--- a/BitKeeper/etc/ignore 2008-04-08 01:28:54 -07:00
+++ b/BitKeeper/etc/ignore 2008-04-23 17:03:12 -07:00
@@ -3022,3 +3022,14 @@ win/vs8cache.txt
ylwrap
zlib/*.ds?
zlib/*.vcproj
+mysys/tests/test_base64
+mysys/tests/test_bitmap
+mysys/tests/test_gethwaddr
+mysys/tests/test_io_cache
+mysys/tests/test_priority_queue
+mysys/tests/test_thr_alarm
+mysys/tests/test_thr_lock
+mysys/tests/test_vsnprintf
+mysys/tests/testhash
+mysys/tests/.deps/test_charset.Tpo
+mysys/tests/.deps/test_dir.Tpo
diff -Nrup a/Makefile.am b/Makefile.am
--- a/Makefile.am 2008-04-08 02:41:57 -07:00
+++ b/Makefile.am 2008-04-23 17:03:12 -07:00
@@ -33,7 +33,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_d
DIST_SUBDIRS = . include Docs zlib \
cmd-line-utils sql-common scripts \
pstack \
- strings mysys dbug extra regex libmysql libmysql_r client unittest storage plugin \
+ strings mysys dbug mysys/tests extra regex libmysql libmysql_r client unittest storage plugin \
vio sql man tests \
netware libmysqld \
mysql-test support-files sql-bench server-tools \
diff -Nrup a/client/Makefile.am b/client/Makefile.am
--- a/client/Makefile.am 2007-11-01 08:49:37 -07:00
+++ b/client/Makefile.am 2008-04-23 17:03:12 -07:00
@@ -54,6 +54,7 @@ bin_PROGRAMS = mysql \
mysql_SOURCES = mysql.cc readline.cc sql_string.cc \
completion_hash.cc
mysql_LDADD = @readline_link@ @TERMCAP_LIB@ \
+ @ZLIB_LIBS@ \
$(LDADD) $(CXXLDFLAGS)
mysqladmin_SOURCES = mysqladmin.cc
@@ -75,7 +76,7 @@ mysqlimport_SOURCES= mysqlimport.c
mysqlimport_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
@CLIENT_EXTRA_LDFLAGS@ \
$(LIBMYSQLCLIENT_LA) \
- $(top_builddir)/mysys/libmysys.a
+ $(top_builddir)/mysys/libmysys.la
mysqlshow_SOURCES= mysqlshow.c
@@ -84,7 +85,7 @@ mysqlslap_CFLAGS= -DTHREAD -UUNDEF_THRE
mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
@CLIENT_EXTRA_LDFLAGS@ \
$(LIBMYSQLCLIENT_LA) \
- $(top_builddir)/mysys/libmysys.a
+ $(top_builddir)/mysys/libmysys.la
mysqltest_SOURCES= mysqltest.c \
$(top_srcdir)/mysys/my_getsystime.c \
diff -Nrup a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4
--- a/config/ac-macros/zlib.m4 2007-08-30 16:18:56 -07:00
+++ b/config/ac-macros/zlib.m4 2008-04-23 17:03:13 -07:00
@@ -19,7 +19,6 @@ AC_DEFUN([MYSQL_CHECK_ZLIB_DIR], [
save_CPPFLAGS="$CPPFLAGS"
save_LIBS="$LIBS"
CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS"
-LIBS="$LIBS $ZLIB_LIBS"
if test X"$with_server" = Xno
then
zlibsym=zlibVersion
diff -Nrup a/configure.in b/configure.in
--- a/configure.in 2008-04-08 01:29:04 -07:00
+++ b/configure.in 2008-04-23 17:03:12 -07:00
@@ -23,7 +23,7 @@ DOT_FRM_VERSION=6
# See the libtool docs for information on how to do shared lib versions.
SHARED_LIB_MAJOR_VERSION=16
SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
-NDB_SHARED_LIB_MAJOR_VERSION=3
+NDB_SHARED_LIB_MAJOR_VERSION=4
NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
# Set all version vars based on $VERSION. How do we do this more elegant ?
@@ -356,6 +356,7 @@ case "$target_os" in
fi
;;
esac
+
AC_SUBST(CC)
AC_SUBST(CFLAGS)
AC_SUBST(CXX)
@@ -838,20 +839,37 @@ AC_CHECK_HEADERS([xfs/xfs.h])
# and defines HAVE_LIBM etc
#--------------------------------------------------------------------
+dnl Save the current libs into _libs so we can use AC_CHECK_LIB but
+dnl not have -lm go into the global libs list, since we don't need
+dnl it for everything we build and will use M_LIBS instead
+_libs=${LIBS}
+LIBS=''
AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
+M_LIBS=${LIBS}
+LIBS=${_libs}
+dnl Save the current libs into _libs so we can put this into NSL_LIBS
+_libs=${LIBS}
+LIBS=''
AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
AC_CHECK_LIB(nsl, gethostbyname_r))
AC_CHECK_FUNC(gethostbyname_r)
-
-AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
AC_CHECK_FUNC(yp_get_default_domain, ,
AC_CHECK_LIB(nsl, yp_get_default_domain))
+NSL_LIBS=${LIBS}
+LIBS=${_libs}
+
+AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
# This may get things to compile even if bind-8 is installed
AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
# Check if crypt() exists in libc or libcrypt, sets LIBS if needed
+dnl Save the current libs into _libs so we can put this into CRYPT_LIBS
+_libs=${LIBS}
+LIBS=''
AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
+CRYPT_LIBS=${LIBS}
+LIBS=${_libs}
# See if we need a library for address lookup.
AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])
@@ -2678,6 +2696,9 @@ sql_client_dirs="$sql_client_dirs client
CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS"
+AC_SUBST(M_LIBS)
+AC_SUBST(CRYPT_LIBS)
+AC_SUBST(NSL_LIBS)
AC_SUBST(CLIENT_LIBS)
AC_SUBST(CLIENT_THREAD_LIBS)
AC_SUBST(NON_THREADED_LIBS)
@@ -2759,7 +2780,7 @@ if test -d "$srcdir/cmd-line-utils/readl
AC_CONFIG_FILES(cmd-line-utils/readline/Makefile)
fi
-AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
+AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile mysys/tests/Makefile dnl
unittest/Makefile unittest/mytap/Makefile unittest/mytap/t/Makefile dnl
unittest/mysys/Makefile unittest/examples/Makefile dnl
strings/Makefile regex/Makefile storage/Makefile dnl
diff -Nrup a/dbug/Makefile.am b/dbug/Makefile.am
--- a/dbug/Makefile.am 2006-12-30 16:06:32 -08:00
+++ b/dbug/Makefile.am 2008-04-23 17:03:13 -07:00
@@ -16,10 +16,11 @@
# MA 02111-1307, USA
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
-LDADD = libdbug.a ../mysys/libmysys.a ../strings/libmystrings.a
-pkglib_LIBRARIES = libdbug.a
+LDADD = libdbug.la $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la ${ZLIB_LIBS}
+noinst_LTLIBRARIES = libdbug.la
noinst_HEADERS = dbug_long.h
-libdbug_a_SOURCES = dbug.c sanity.c
+libdbug_la_SOURCES = dbug.c sanity.c
EXTRA_DIST = CMakeLists.txt example1.c example2.c example3.c \
user.r monty.doc dbug_add_tags.pl \
my_main.c main.c factorial.c dbug_analyze.c \
diff -Nrup a/extra/Makefile.am b/extra/Makefile.am
--- a/extra/Makefile.am 2007-08-30 16:23:48 -07:00
+++ b/extra/Makefile.am 2008-04-23 17:03:13 -07:00
@@ -15,8 +15,10 @@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_srcdir)/sql
-LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
- ../dbug/libdbug.a ../strings/libmystrings.a \
+LDADD = @CLIENT_EXTRA_LDFLAGS@ \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la \
$(ZLIB_LIBS)
BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \
$(top_builddir)/include/sql_state.h \
diff -Nrup a/libmysql/Makefile.am b/libmysql/Makefile.am
--- a/libmysql/Makefile.am 2007-11-22 03:34:11 -08:00
+++ b/libmysql/Makefile.am 2008-04-23 17:03:13 -07:00
@@ -22,7 +22,7 @@
target = libmysqlclient.la
target_defs = -DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
-LIBS = @CLIENT_LIBS@
+LIBS = @CLIENT_LIBS@ @M_LIBS@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
$(openssl_includes) @ZLIB_INCLUDES@
diff -Nrup a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am
--- a/libmysql_r/Makefile.am 2007-10-08 11:55:22 -07:00
+++ b/libmysql_r/Makefile.am 2008-04-23 17:03:13 -07:00
@@ -22,7 +22,7 @@
target = libmysqlclient_r.la
target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
-LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
+LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ @M_LIBS@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
$(openssl_includes) @ZLIB_INCLUDES@
diff -Nrup a/libmysqld/Makefile.am b/libmysqld/Makefile.am
--- a/libmysqld/Makefile.am 2008-04-08 01:29:04 -07:00
+++ b/libmysqld/Makefile.am 2008-04-23 17:03:13 -07:00
@@ -95,9 +95,9 @@ sql_yacc.cc sql_yacc.h: $(top_srcdir)/sq
# The following libraries should be included in libmysqld.a
INC_LIB= $(top_builddir)/regex/libregex.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a \
- $(top_builddir)/dbug/libdbug.a \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la \
+ $(top_builddir)/dbug/libdbug.la \
$(top_builddir)/vio/libvio.a \
@NDB_SCI_LIBS@ \
@mysql_plugin_libs@ \
diff -Nrup a/mysys/Makefile.am b/mysys/Makefile.am
--- a/mysys/Makefile.am 2008-03-28 12:08:26 -07:00
+++ b/mysys/Makefile.am 2008-04-23 17:03:13 -07:00
@@ -18,10 +18,11 @@ MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix)
INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
-I$(top_srcdir)/include -I$(srcdir)
-pkglib_LIBRARIES = libmysys.a
-LDADD = libmysys.a $(top_builddir)/strings/libmystrings.a $(top_builddir)/dbug/libdbug.a
+LDADD = $(top_builddir)/strings/libmystrings.la \
+ $(top_builddir)/dbug/libdbug.la @M_LIBS@ @ZLIB_LIBS@
+noinst_LTLIBRARIES = libmysys.la
noinst_HEADERS = mysys_priv.h my_static.h my_handler_errors.h
-libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \
+libmysys_la_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \
mf_path.c mf_loadpath.c my_file.c \
my_open.c my_create.c my_dup.c my_seek.c my_read.c \
my_pread.c my_write.c my_getpagesize.c \
@@ -52,16 +53,13 @@ libmysys_a_SOURCES = my_init.c my_get
my_gethostbyname.c rijndael.c my_aes.c sha1.c \
my_handler.c my_netware.c my_largepage.c \
my_memmem.c \
- my_windac.c my_access.c base64.c my_libwrap.c
-EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
+ my_windac.c my_access.c base64.c my_libwrap.c \
+ thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
thr_mutex.c thr_rwlock.c \
- CMakeLists.txt mf_soundex.c \
+ mf_soundex.c \
my_conio.c my_wincond.c my_winthread.c
-libmysys_a_LIBADD = @THREAD_LOBJECTS@
-# test_dir_DEPENDENCIES= $(LIBRARIES)
-# testhash_DEPENDENCIES= $(LIBRARIES)
-# test_charset_DEPENDENCIES= $(LIBRARIES)
-# charset2html_DEPENDENCIES= $(LIBRARIES)
+EXTRA_DIST = CMakeLists.txt
+
DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \
-DDATADIR="\"$(MYSQLDATAdir)\"" \
-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
@@ -70,61 +68,6 @@ DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\"
-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
@DEFS@
-
-libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@
-
-# I hope this always does the right thing. Otherwise this is only test programs
-FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
-
-#
-# The CP .. RM stuff is to avoid problems with some compilers (like alpha ccc)
-# which automaticly removes the object files you use to compile a final program
-#
-
-test_bitmap$(EXEEXT): my_bitmap.c $(LIBRARIES)
- $(LINK) $(FLAGS) -DMAIN ./my_bitmap.c $(LDADD) $(LIBS)
-
-test_priority_queue$(EXEEXT): queues.c $(LIBRARIES)
- $(LINK) $(FLAGS) -DMAIN ./queues.c $(LDADD) $(LIBS)
-
-test_thr_alarm$(EXEEXT): thr_alarm.c $(LIBRARIES)
- $(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c
- $(LINK) $(FLAGS) -DMAIN ./test_thr_alarm.c $(LDADD) $(LIBS)
- $(RM) -f ./test_thr_alarm.c
-
-test_thr_lock$(EXEEXT): thr_lock.c $(LIBRARIES)
- $(CP) $(srcdir)/thr_lock.c test_thr_lock.c
- $(LINK) $(FLAGS) -DMAIN ./test_thr_lock.c $(LDADD) $(LIBS)
- $(RM) -f ./test_thr_lock.c
-
-test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LIBRARIES)
- $(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c
- $(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS)
- $(RM) -f test_vsnprintf.c
-
-test_io_cache$(EXEEXT): mf_iocache.c $(LIBRARIES)
- $(CP) $(srcdir)/mf_iocache.c test_io_cache.c
- $(LINK) $(FLAGS) -DMAIN ./test_io_cache.c $(LDADD) $(LIBS)
- $(RM) -f test_io_cache.c
-
-test_dir$(EXEEXT): test_dir.c $(LIBRARIES)
- $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)
-
-test_charset$(EXEEXT): test_charset.c $(LIBRARIES)
- $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)
-
-testhash$(EXEEXT): testhash.c $(LIBRARIES)
- $(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS)
-
-test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LIBRARIES)
- $(CP) $(srcdir)/my_gethwaddr.c ./test_gethwaddr.c
- $(LINK) $(FLAGS) -DMAIN ./test_gethwaddr.c $(LDADD) $(LIBS)
- $(RM) -f ./test_gethwaddr.c
-
-test_base64$(EXEEXT): base64.c $(LIBRARIES)
- $(CP) $(srcdir)/base64.c ./test_base64.c
- $(LINK) $(FLAGS) -DMAIN ./test_base64.c $(LDADD) $(LIBS)
- $(RM) -f ./test_base64.c
# Don't update the files from bitkeeper
%::SCCS/s.%
diff -Nrup a/mysys/my_bitmap.c b/mysys/my_bitmap.c
--- a/mysys/my_bitmap.c 2007-10-11 08:07:33 -07:00
+++ b/mysys/my_bitmap.c 2008-04-23 17:03:14 -07:00
@@ -763,7 +763,7 @@ uint get_rand_bit(uint bitsize)
return (rand() % bitsize);
}
-bool test_set_get_clear_bit(MY_BITMAP *map, uint bitsize)
+my_bool test_set_get_clear_bit(MY_BITMAP *map, uint bitsize)
{
uint i, test_bit;
uint no_loops= bitsize > 128 ? 128 : bitsize;
@@ -786,7 +786,7 @@ error2:
return TRUE;
}
-bool test_flip_bit(MY_BITMAP *map, uint bitsize)
+my_bool test_flip_bit(MY_BITMAP *map, uint bitsize)
{
uint i, test_bit;
uint no_loops= bitsize > 128 ? 128 : bitsize;
@@ -809,13 +809,13 @@ error2:
return TRUE;
}
-bool test_operators(MY_BITMAP *map __attribute__((unused)),
+my_bool test_operators(MY_BITMAP *map __attribute__((unused)),
uint bitsize __attribute__((unused)))
{
return FALSE;
}
-bool test_get_all_bits(MY_BITMAP *map, uint bitsize)
+my_bool test_get_all_bits(MY_BITMAP *map, uint bitsize)
{
uint i;
bitmap_set_all(map);
@@ -857,7 +857,7 @@ error6:
return TRUE;
}
-bool test_compare_operators(MY_BITMAP *map, uint bitsize)
+my_bool test_compare_operators(MY_BITMAP *map, uint bitsize)
{
uint i, j, test_bit1, test_bit2, test_bit3,test_bit4;
uint no_loops= bitsize > 128 ? 128 : bitsize;
@@ -963,7 +963,7 @@ error5:
return TRUE;
}
-bool test_count_bits_set(MY_BITMAP *map, uint bitsize)
+my_bool test_count_bits_set(MY_BITMAP *map, uint bitsize)
{
uint i, bit_count=0, test_bit;
uint no_loops= bitsize > 128 ? 128 : bitsize;
@@ -989,7 +989,7 @@ error2:
return TRUE;
}
-bool test_get_first_bit(MY_BITMAP *map, uint bitsize)
+my_bool test_get_first_bit(MY_BITMAP *map, uint bitsize)
{
uint i, test_bit;
uint no_loops= bitsize > 128 ? 128 : bitsize;
@@ -1014,7 +1014,7 @@ error2:
return TRUE;
}
-bool test_get_next_bit(MY_BITMAP *map, uint bitsize)
+my_bool test_get_next_bit(MY_BITMAP *map, uint bitsize)
{
uint i, j, test_bit;
uint no_loops= bitsize > 128 ? 128 : bitsize;
@@ -1033,7 +1033,7 @@ error1:
return TRUE;
}
-bool test_prefix(MY_BITMAP *map, uint bitsize)
+my_bool test_prefix(MY_BITMAP *map, uint bitsize)
{
uint i, j, test_bit;
uint no_loops= bitsize > 128 ? 128 : bitsize;
@@ -1068,7 +1068,7 @@ error3:
}
-bool do_test(uint bitsize)
+my_bool do_test(uint bitsize)
{
MY_BITMAP map;
my_bitmap_map buf[1024];
diff -Nrup a/mysys/queues.c b/mysys/queues.c
--- a/mysys/queues.c 2008-02-18 14:29:35 -08:00
+++ b/mysys/queues.c 2008-04-23 17:03:14 -07:00
@@ -384,11 +384,11 @@ static uint tot_no_parts= 0;
static uint tot_no_loops= 0;
static uint expected_part= 0;
static uint expected_num= 0;
-static bool max_ind= 0;
-static bool fix_used= 0;
+static my_bool max_ind= 0;
+static my_bool fix_used= 0;
static ulonglong start_time= 0;
-static bool is_divisible_by(uint num, uint divisor)
+static my_bool is_divisible_by(uint num, uint divisor)
{
uint quotient= num / divisor;
if (quotient * divisor == num)
@@ -495,7 +495,7 @@ static int test_compare(void *null_arg,
return 0;
}
-bool check_num(uint num_part)
+my_bool check_num(uint num_part)
{
uint part= num_part >> 22;
uint num= num_part & 0x3FFFFF;
@@ -546,7 +546,7 @@ void perform_insert(QUEUE *queue)
}
}
-bool perform_ins_del(QUEUE *queue, bool max_ind)
+my_bool perform_ins_del(QUEUE *queue, my_bool max_ind)
{
uint i= 0, no_loops= tot_no_loops, j= tot_no_parts;
do
@@ -574,10 +574,10 @@ bool perform_ins_del(QUEUE *queue, bool
return FALSE;
}
-bool do_test(uint no_parts, uint l_max_ind, bool l_fix_used)
+my_bool do_test(uint no_parts, uint l_max_ind, my_bool l_fix_used)
{
QUEUE queue;
- bool result;
+ my_bool result;
max_ind= l_max_ind;
fix_used= l_fix_used;
init_queue(&queue, no_parts, 0, max_ind, test_compare, NULL);
diff -Nrup a/mysys/test_charset.c b/mysys/test_charset.c
--- a/mysys/test_charset.c 2007-08-15 06:42:54 -07:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,91 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-
-#include <my_global.h>
-#include <m_ctype.h>
-#include <my_sys.h>
-#include <mysql_version.h>
-
-#include <stdio.h>
-
-static void _print_array(uint8 *data, uint size)
-{
- uint i;
- for (i = 0; i < size; ++i)
- {
- if (i == 0 || i % 16 == size % 16) printf(" ");
- printf(" %02x", data[i]);
- if ((i+1) % 16 == size % 16) printf("\n");
- }
-}
-
-static void _print_csinfo(CHARSET_INFO *cs)
-{
- printf("%s #%d\n", cs->name, cs->number);
- printf("ctype:\n"); _print_array(cs->ctype, 257);
- printf("to_lower:\n"); _print_array(cs->to_lower, 256);
- printf("to_upper:\n"); _print_array(cs->to_upper, 256);
- printf("sort_order:\n"); _print_array(cs->sort_order, 256);
- printf("collate: %3s (%d, %p, %p, %p)\n",
- cs->strxfrm_multiply ? "yes" : "no",
- cs->strxfrm_multiply,
- cs->strnncoll,
- cs->strnxfrm,
- cs->like_range);
- printf("multi-byte: %3s (%d, %p, %p, %p)\n",
- cs->mbmaxlen > 1 ? "yes" : "no",
- cs->mbmaxlen,
- cs->ismbchar,
- cs->ismbhead,
- cs->mbcharlen);
-}
-
-
-int main(int argc, char **argv) {
- const char *the_set = MYSQL_CHARSET;
- char *cs_list;
- int argcnt = 1;
- CHARSET_INFO *cs;
-
- my_init();
-
- if (argc > argcnt && argv[argcnt][0] == '-' && argv[argcnt][1] == '#')
- DBUG_PUSH(argv[argcnt++]+2);
-
- if (argc > argcnt)
- the_set = argv[argcnt++];
-
- if (argc > argcnt)
- charsets_dir = argv[argcnt++];
-
- if (!(cs= get_charset_by_name(the_set, MYF(MY_WME))))
- return 1;
-
- puts("CHARSET INFO:");
- _print_csinfo(cs);
- fflush(stdout);
-
-#ifdef NOT_USED_ANYMORE
- cs_list = list_charsets(MYF(MY_CS_COMPILED | MY_CS_CONFIG));
- printf("LIST OF CHARSETS (compiled + *.conf):\n%s\n", cs_list);
- my_free(cs_list,MYF(0));
-
- cs_list = list_charsets(MYF(MY_CS_INDEX | MY_CS_LOADED));
- printf("LIST OF CHARSETS (index + loaded):\n%s\n", cs_list);
- my_free(cs_list,MYF(0));
-#endif
-
- return 0;
-}
diff -Nrup a/mysys/test_dir.c b/mysys/test_dir.c
--- a/mysys/test_dir.c 2006-12-23 11:19:47 -08:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,47 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-
-/* TODO: Test all functions */
-
-#include "mysys_priv.h"
-#include "my_dir.h"
-
-int main(int argc, char *argv[])
-{
- MY_DIR *a;
- uint f;
- DBUG_ENTER ("main");
- DBUG_PROCESS (argv[0]);
-
- if (--argc > 0 && (*(++argv))[0] == '-' && (*argv)[1] == '#' )
- DBUG_PUSH (*argv+2);
-
- a = my_dir("./", 0);
- for (f = 0; f < a->number_off_files; f++)
- {
- printf("%s\n", a->dir_entry[f].name);
- }
-
- a = my_dir("./", MY_WANT_STAT);
- for (f = 0; f < a->number_off_files; f++)
- {
- printf("%s %d %d %d %s\n", a->dir_entry[f].name,
- (int) a->dir_entry[f].mystat.st_size,
- (int) a->dir_entry[f].mystat.st_uid,
- (int) a->dir_entry[f].mystat.st_gid,
- S_ISDIR(a->dir_entry[f].mystat.st_mode) ? "dir" : "");
- }
- return 0;
-}
diff -Nrup a/mysys/testhash.c b/mysys/testhash.c
--- a/mysys/testhash.c 2007-05-10 02:59:26 -07:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,290 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-
-/* Test of hash library: big test */
-
-#include <my_global.h>
-#include <my_sys.h>
-#include <hash.h>
-#include <m_string.h>
-
-#define MAX_RECORDS 100000
-#define MAX_KEYS 3
-
-static int get_options(int argc, char *argv[]);
-static int do_test();
-static int rnd(int max_value);
-
-static uint testflag=0,recant=10000,reclength=37;
-static uint16 key1[1000];
-
-#ifdef DBUG_OFF
-#define hash_check(A) 0
-#else
-my_bool hash_check(HASH *hash);
-#endif
-
-void free_record(void *record);
-
-static uchar *hash2_key(const uchar *rec,uint *length,
- my_bool not_used __attribute__((unused)))
-{
- *length=(uint) (uchar) rec[reclength-1];
- return (uchar*) rec;
-}
-
-/* main program */
-
-int main(int argc,char *argv[])
-{
- MY_INIT(argv[0]);
- DBUG_PROCESS(argv[0]);
-
- get_options(argc,argv);
-
- exit(do_test());
-}
-
-static int do_test()
-{
- register uint i,j;
- uint n1,n2,n3;
- uint write_count,update,delete;
- ulong pos;
- unsigned long key_check;
- char *record,*recpos,oldrecord[120],key[10];
- HASH hash,hash2;
- DBUG_ENTER("do_test");
-
- write_count=update=delete=0;
- key_check=0;
- bzero((char*) key1,sizeof(key1[0])*1000);
-
- printf("- Creating hash\n");
- if (hash_init(&hash, default_charset_info, recant/2, 0, 6, 0, free_record, 0))
- goto err;
- printf("- Writing records:\n");
-
- for (i=0 ; i < recant ; i++)
- {
- n1=rnd(1000); n2=rnd(100); n3=rnd(min(recant*5,MAX_RECORDS));
- record= (char*) my_malloc(reclength,MYF(MY_FAE));
- sprintf(record,"%6d:%4d:%8d:Pos: %4d ",n1,n2,n3,write_count);
- if (my_hash_insert(&hash,record))
- {
- printf("Error: %d in write at record: %d\n",my_errno,i);
- goto err;
- }
- key1[n1]++;
- key_check+=n1;
- write_count++;
- }
- if (hash_check(&hash))
- {
- puts("Heap keys crashed");
- goto err;
- }
- printf("- Delete\n");
- for (i=0 ; i < write_count/10 ; i++)
- {
- for (j=rnd(1000) ; j>0 && key1[j] == 0 ; j--) ;
- if (j != 0)
- {
- sprintf(key,"%6d",j);
- if (!(recpos=hash_search(&hash,key,0)))
- {
- printf("can't find key1: \"%s\"\n",key);
- goto err;
- }
- key1[atoi(recpos)]--;
- key_check-=atoi(recpos);
- memcpy(oldrecord,recpos,reclength);
- if (hash_delete(&hash,recpos))
- {
- printf("error: %d; can't delete record: \"%s\"\n", my_errno,oldrecord);
- goto err;
- }
- delete++;
- if (testflag == 2 && hash_check(&hash))
- {
- puts("Heap keys crashed");
- goto err;
- }
- }
- }
- if (hash_check(&hash))
- {
- puts("Hash keys crashed");
- goto err;
- }
-
- printf("- Update\n");
- for (i=0 ; i < write_count/10 ; i++)
- {
- n1=rnd(1000); n2=rnd(100); n3=rnd(min(recant*2,MAX_RECORDS));
- for (j=rnd(1000) ; j>0 && key1[j] == 0 ; j--) ;
- if (j)
- {
- sprintf(key,"%6d",j);
- if (!(recpos=hash_search(&hash,key,0)))
- {
- printf("can't find key1: \"%s\"\n",key);
- goto err;
- }
- key1[atoi(recpos)]--;
- key_check=key_check-atoi(recpos)+n1;
- key1[n1]++;
- sprintf(recpos,"%6d:%4d:%8d:XXX: %4d ",n1,n2,n3,update);
- update++;
- if (hash_update(&hash,recpos,key,0))
- {
- printf("can't update key1: \"%s\"\n",key);
- goto err;
- }
- if (testflag == 3 && hash_check(&hash))
- {
- printf("Heap keys crashed for %d update\n",update);
- goto err;
- }
- }
- }
- if (hash_check(&hash))
- {
- puts("Heap keys crashed");
- goto err;
- }
-
- for (j=0 ; j < 1000 ; j++)
- if (key1[j] > 1)
- break;
- if (key1[j] > 1)
- {
- HASH_SEARCH_STATE state;
- printf("- Testing identical read\n");
- sprintf(key,"%6d",j);
- pos=1;
- if (!(recpos= hash_first(&hash, key, 0, &state)))
- {
- printf("can't find key1: \"%s\"\n",key);
- goto err;
- }
- while (hash_next(&hash, key, 0, &state) && pos < (ulong) (key1[j]+10))
- pos++;
- if (pos != (ulong) key1[j])
- {
- printf("Found %ld copies of key: %s. Should be %d",pos,key,key1[j]);
- goto err;
- }
- }
- printf("- Creating output heap-file 2\n");
- if (hash_init(&hash2, default_charset_info, hash.records, 0, 0, hash2_key, free_record,0))
- goto err;
-
- printf("- Copying and removing records\n");
- pos=0;
- while ((recpos=hash_element(&hash,0)))
- {
- record=(uchar*) my_malloc(reclength,MYF(MY_FAE));
- memcpy(record,recpos,reclength);
- record[reclength-1]=rnd(5)+1;
- if (my_hash_insert(&hash2,record))
- {
- printf("Got error when inserting record: %*s",reclength,record);
- goto err;
- }
- key_check-=atoi(record);
- write_count++;
- if (hash_delete(&hash,recpos))
- {
- printf("Got error when deleting record: %*s",reclength,recpos);
- goto err;
- }
- if (testflag==4)
- {
- if (hash_check(&hash) || hash_check(&hash2))
- {
- puts("Hash keys crashed");
- goto err;
- }
- }
- pos++;
- }
- if (hash_check(&hash) || hash_check(&hash2))
- {
- puts("Hash keys crashed");
- goto err;
- }
- if (key_check != 0)
- {
- printf("Key check didn't get to 0 (%ld)\n",key_check);
- }
-
- printf("\nFollowing test have been made:\n");
- printf("Write records: %d\nUpdate records: %d\nDelete records: %d\n", write_count,
- update,delete);
- hash_free(&hash); hash_free(&hash2);
- my_end(MY_GIVE_INFO);
- DBUG_RETURN(0);
-err:
- printf("Got error: %d when using hashing\n",my_errno);
- DBUG_RETURN(-1);
-} /* main */
-
-
-/* read options */
-/* NOTE! DBUG not initialised - no debugging here! */
-
-static int get_options(int argc, char **argv)
-{
- char *pos,*progname;
-
- progname= argv[0];
-
- while (--argc >0 && *(pos = *(++argv)) == '-' ) {
- switch(*++pos) {
- case 'm': /* records */
- recant=atoi(++pos);
- break;
- case 't':
- testflag=atoi(++pos); /* testmod */
- break;
- case 'V':
- case 'I':
- case '?':
- printf("%s Ver 1.0 for %s at %s\n",progname,SYSTEM_TYPE,MACHINE_TYPE);
- printf("MySQL AB, by Monty\n\n");
- printf("Usage: %s [-?ABIKLWv] [-m#] [-t#]\n",progname);
- exit(0);
- case '#':
- DBUG_PUSH (++pos);
- break;
- }
- }
- return 0;
-} /* get_options */
-
-
-/* Get a random number in the interval 0 <= x <= n */
-
-static int rnd(int max_value)
-{
- return (int) ((rand() & 32767)/32767.0*max_value);
-} /* rnd */
-
-
-void free_record(void *record)
-{
- my_free(record,MYF(0));
-}
diff -Nrup a/mysys/tests/Makefile.am b/mysys/tests/Makefile.am
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysys/tests/Makefile.am 2008-04-23 17:03:18 -07:00
@@ -0,0 +1,52 @@
+# Copyright (C) 2000-2006 MySQL AB
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+MYSQLDATAdir = $(localstatedir)
+MYSQLSHAREdir = $(pkgdatadir)
+MYSQLBASEdir= $(prefix)
+INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
+ -I$(top_srcdir)/include -I$(srcdir) \
+ -I$(top_srcdir)/mysys
+LDADD = $(top_builddir)/mysys/libmysys.la $(top_builddir)/strings/libmystrings.la $(top_builddir)/dbug/libdbug.la
+
+DEFS = -DMAIN \
+ -DDEFAULT_BASEDIR=\"$(prefix)\" \
+ -DDATADIR="\"$(MYSQLDATAdir)\"" \
+ -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
+ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
+ -DDEFAULT_HOME_ENV=MYSQL_HOME \
+ -DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
+ -DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
+ @DEFS@
+
+# I hope this always does the right thing. Otherwise this is only test programs
+FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
+
+noinst_PROGRAMS = test_bitmap test_priority_queue test_thr_alarm test_thr_lock test_vsnprintf test_io_cache testhash test_gethwaddr test_base64 #test_charset
+test_bitmap_SOURCES = $(top_srcdir)/mysys/my_bitmap.c
+test_thr_alarm_SOURCES = $(top_srcdir)/mysys/thr_alarm.c
+test_priority_queue_SOURCES = $(top_srcdir)/mysys/queues.c
+test_thr_lock_SOURCES = $(top_srcdir)/mysys/thr_lock.c
+test_vsnprintf_SOURCES = $(top_srcdir)/strings/my_vsnprintf.c
+test_io_cache_SOURCES = $(top_srcdir)/mysys/mf_iocache.c
+#test_dir_SOURCES = test_dir.c
+#test_charset_SOURCES = test_charset.c
+testhash_SOURCES = testhash.c
+test_gethwaddr_SOURCES = $(top_srcdir)/mysys/my_gethwaddr.c
+test_base64_SOURCES = $(top_srcdir)/mysys/base64.c
+test_base64_LDADD = @M_LIBS@ $(top_builddir)/mysys/libmysys.la $(top_builddir)/strings/libmystrings.la
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
diff -Nrup a/mysys/tests/test_charset.c b/mysys/tests/test_charset.c
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysys/tests/test_charset.c 2008-04-23 17:02:42 -07:00
@@ -0,0 +1,91 @@
+/* Copyright (C) 2000 MySQL AB
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+
+#include <my_global.h>
+#include <m_ctype.h>
+#include <my_sys.h>
+#include <mysql_version.h>
+
+#include <stdio.h>
+
+static void _print_array(uint8 *data, uint size)
+{
+ uint i;
+ for (i = 0; i < size; ++i)
+ {
+ if (i == 0 || i % 16 == size % 16) printf(" ");
+ printf(" %02x", data[i]);
+ if ((i+1) % 16 == size % 16) printf("\n");
+ }
+}
+
+static void _print_csinfo(CHARSET_INFO *cs)
+{
+ printf("%s #%d\n", cs->name, cs->number);
+ printf("ctype:\n"); _print_array(cs->ctype, 257);
+ printf("to_lower:\n"); _print_array(cs->to_lower, 256);
+ printf("to_upper:\n"); _print_array(cs->to_upper, 256);
+ printf("sort_order:\n"); _print_array(cs->sort_order, 256);
+ printf("collate: %3s (%d, %p, %p, %p)\n",
+ cs->strxfrm_multiply ? "yes" : "no",
+ cs->strxfrm_multiply,
+ cs->strnncoll,
+ cs->strnxfrm,
+ cs->like_range);
+ printf("multi-byte: %3s (%d, %p, %p, %p)\n",
+ cs->mbmaxlen > 1 ? "yes" : "no",
+ cs->mbmaxlen,
+ cs->ismbchar,
+ cs->ismbhead,
+ cs->mbcharlen);
+}
+
+
+int main(int argc, char **argv) {
+ const char *the_set = MYSQL_CHARSET;
+ char *cs_list;
+ int argcnt = 1;
+ CHARSET_INFO *cs;
+
+ my_init();
+
+ if (argc > argcnt && argv[argcnt][0] == '-' && argv[argcnt][1] == '#')
+ DBUG_PUSH(argv[argcnt++]+2);
+
+ if (argc > argcnt)
+ the_set = argv[argcnt++];
+
+ if (argc > argcnt)
+ charsets_dir = argv[argcnt++];
+
+ if (!(cs= get_charset_by_name(the_set, MYF(MY_WME))))
+ return 1;
+
+ puts("CHARSET INFO:");
+ _print_csinfo(cs);
+ fflush(stdout);
+
+#ifdef NOT_USED_ANYMORE
+ cs_list = list_charsets(MYF(MY_CS_COMPILED | MY_CS_CONFIG));
+ printf("LIST OF CHARSETS (compiled + *.conf):\n%s\n", cs_list);
+ my_free(cs_list,MYF(0));
+
+ cs_list = list_charsets(MYF(MY_CS_INDEX | MY_CS_LOADED));
+ printf("LIST OF CHARSETS (index + loaded):\n%s\n", cs_list);
+ my_free(cs_list,MYF(0));
+#endif
+
+ return 0;
+}
diff -Nrup a/mysys/tests/test_dir.c b/mysys/tests/test_dir.c
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysys/tests/test_dir.c 2008-04-23 17:02:42 -07:00
@@ -0,0 +1,47 @@
+/* Copyright (C) 2000 MySQL AB
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+
+/* TODO: Test all functions */
+
+#include "mysys_priv.h"
+#include "my_dir.h"
+
+int main(int argc, char *argv[])
+{
+ MY_DIR *a;
+ uint f;
+ DBUG_ENTER ("main");
+ DBUG_PROCESS (argv[0]);
+
+ if (--argc > 0 && (*(++argv))[0] == '-' && (*argv)[1] == '#' )
+ DBUG_PUSH (*argv+2);
+
+ a = my_dir("./", 0);
+ for (f = 0; f < a->number_off_files; f++)
+ {
+ printf("%s\n", a->dir_entry[f].name);
+ }
+
+ a = my_dir("./", MY_WANT_STAT);
+ for (f = 0; f < a->number_off_files; f++)
+ {
+ printf("%s %d %d %d %s\n", a->dir_entry[f].name,
+ (int) a->dir_entry[f].mystat.st_size,
+ (int) a->dir_entry[f].mystat.st_uid,
+ (int) a->dir_entry[f].mystat.st_gid,
+ S_ISDIR(a->dir_entry[f].mystat.st_mode) ? "dir" : "");
+ }
+ return 0;
+}
diff -Nrup a/mysys/tests/testhash.c b/mysys/tests/testhash.c
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysys/tests/testhash.c 2008-04-23 17:02:42 -07:00
@@ -0,0 +1,290 @@
+/* Copyright (C) 2000 MySQL AB
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+
+/* Test of hash library: big test */
+
+#include <my_global.h>
+#include <my_sys.h>
+#include <hash.h>
+#include <m_string.h>
+
+#define MAX_RECORDS 100000
+#define MAX_KEYS 3
+
+static int get_options(int argc, char *argv[]);
+static int do_test();
+static int rnd(int max_value);
+
+static uint testflag=0,recant=10000,reclength=37;
+static uint16 key1[1000];
+
+#ifdef DBUG_OFF
+#define hash_check(A) 0
+#else
+my_bool hash_check(HASH *hash);
+#endif
+
+void free_record(void *record);
+
+static uchar *hash2_key(const uchar *rec,uint *length,
+ my_bool not_used __attribute__((unused)))
+{
+ *length=(uint) (uchar) rec[reclength-1];
+ return (uchar*) rec;
+}
+
+/* main program */
+
+int main(int argc,char *argv[])
+{
+ MY_INIT(argv[0]);
+ DBUG_PROCESS(argv[0]);
+
+ get_options(argc,argv);
+
+ exit(do_test());
+}
+
+static int do_test()
+{
+ register uint i,j;
+ uint n1,n2,n3;
+ uint write_count,update,delete;
+ ulong pos;
+ unsigned long key_check;
+ char *record,*recpos,oldrecord[120],key[10];
+ HASH hash,hash2;
+ DBUG_ENTER("do_test");
+
+ write_count=update=delete=0;
+ key_check=0;
+ bzero((char*) key1,sizeof(key1[0])*1000);
+
+ printf("- Creating hash\n");
+ if (hash_init(&hash, default_charset_info, recant/2, 0, 6, 0, free_record, 0))
+ goto err;
+ printf("- Writing records:\n");
+
+ for (i=0 ; i < recant ; i++)
+ {
+ n1=rnd(1000); n2=rnd(100); n3=rnd(min(recant*5,MAX_RECORDS));
+ record= (char*) my_malloc(reclength,MYF(MY_FAE));
+ sprintf(record,"%6d:%4d:%8d:Pos: %4d ",n1,n2,n3,write_count);
+ if (my_hash_insert(&hash,record))
+ {
+ printf("Error: %d in write at record: %d\n",my_errno,i);
+ goto err;
+ }
+ key1[n1]++;
+ key_check+=n1;
+ write_count++;
+ }
+ if (hash_check(&hash))
+ {
+ puts("Heap keys crashed");
+ goto err;
+ }
+ printf("- Delete\n");
+ for (i=0 ; i < write_count/10 ; i++)
+ {
+ for (j=rnd(1000) ; j>0 && key1[j] == 0 ; j--) ;
+ if (j != 0)
+ {
+ sprintf(key,"%6d",j);
+ if (!(recpos=hash_search(&hash,key,0)))
+ {
+ printf("can't find key1: \"%s\"\n",key);
+ goto err;
+ }
+ key1[atoi(recpos)]--;
+ key_check-=atoi(recpos);
+ memcpy(oldrecord,recpos,reclength);
+ if (hash_delete(&hash,recpos))
+ {
+ printf("error: %d; can't delete record: \"%s\"\n", my_errno,oldrecord);
+ goto err;
+ }
+ delete++;
+ if (testflag == 2 && hash_check(&hash))
+ {
+ puts("Heap keys crashed");
+ goto err;
+ }
+ }
+ }
+ if (hash_check(&hash))
+ {
+ puts("Hash keys crashed");
+ goto err;
+ }
+
+ printf("- Update\n");
+ for (i=0 ; i < write_count/10 ; i++)
+ {
+ n1=rnd(1000); n2=rnd(100); n3=rnd(min(recant*2,MAX_RECORDS));
+ for (j=rnd(1000) ; j>0 && key1[j] == 0 ; j--) ;
+ if (j)
+ {
+ sprintf(key,"%6d",j);
+ if (!(recpos=hash_search(&hash,key,0)))
+ {
+ printf("can't find key1: \"%s\"\n",key);
+ goto err;
+ }
+ key1[atoi(recpos)]--;
+ key_check=key_check-atoi(recpos)+n1;
+ key1[n1]++;
+ sprintf(recpos,"%6d:%4d:%8d:XXX: %4d ",n1,n2,n3,update);
+ update++;
+ if (hash_update(&hash,recpos,key,0))
+ {
+ printf("can't update key1: \"%s\"\n",key);
+ goto err;
+ }
+ if (testflag == 3 && hash_check(&hash))
+ {
+ printf("Heap keys crashed for %d update\n",update);
+ goto err;
+ }
+ }
+ }
+ if (hash_check(&hash))
+ {
+ puts("Heap keys crashed");
+ goto err;
+ }
+
+ for (j=0 ; j < 1000 ; j++)
+ if (key1[j] > 1)
+ break;
+ if (key1[j] > 1)
+ {
+ HASH_SEARCH_STATE state;
+ printf("- Testing identical read\n");
+ sprintf(key,"%6d",j);
+ pos=1;
+ if (!(recpos= hash_first(&hash, key, 0, &state)))
+ {
+ printf("can't find key1: \"%s\"\n",key);
+ goto err;
+ }
+ while (hash_next(&hash, key, 0, &state) && pos < (ulong) (key1[j]+10))
+ pos++;
+ if (pos != (ulong) key1[j])
+ {
+ printf("Found %ld copies of key: %s. Should be %d",pos,key,key1[j]);
+ goto err;
+ }
+ }
+ printf("- Creating output heap-file 2\n");
+ if (hash_init(&hash2, default_charset_info, hash.records, 0, 0, hash2_key, free_record,0))
+ goto err;
+
+ printf("- Copying and removing records\n");
+ pos=0;
+ while ((recpos=hash_element(&hash,0)))
+ {
+ record=(uchar*) my_malloc(reclength,MYF(MY_FAE));
+ memcpy(record,recpos,reclength);
+ record[reclength-1]=rnd(5)+1;
+ if (my_hash_insert(&hash2,record))
+ {
+ printf("Got error when inserting record: %*s",reclength,record);
+ goto err;
+ }
+ key_check-=atoi(record);
+ write_count++;
+ if (hash_delete(&hash,recpos))
+ {
+ printf("Got error when deleting record: %*s",reclength,recpos);
+ goto err;
+ }
+ if (testflag==4)
+ {
+ if (hash_check(&hash) || hash_check(&hash2))
+ {
+ puts("Hash keys crashed");
+ goto err;
+ }
+ }
+ pos++;
+ }
+ if (hash_check(&hash) || hash_check(&hash2))
+ {
+ puts("Hash keys crashed");
+ goto err;
+ }
+ if (key_check != 0)
+ {
+ printf("Key check didn't get to 0 (%ld)\n",key_check);
+ }
+
+ printf("\nFollowing test have been made:\n");
+ printf("Write records: %d\nUpdate records: %d\nDelete records: %d\n", write_count,
+ update,delete);
+ hash_free(&hash); hash_free(&hash2);
+ my_end(MY_GIVE_INFO);
+ DBUG_RETURN(0);
+err:
+ printf("Got error: %d when using hashing\n",my_errno);
+ DBUG_RETURN(-1);
+} /* main */
+
+
+/* read options */
+/* NOTE! DBUG not initialised - no debugging here! */
+
+static int get_options(int argc, char **argv)
+{
+ char *pos,*progname;
+
+ progname= argv[0];
+
+ while (--argc >0 && *(pos = *(++argv)) == '-' ) {
+ switch(*++pos) {
+ case 'm': /* records */
+ recant=atoi(++pos);
+ break;
+ case 't':
+ testflag=atoi(++pos); /* testmod */
+ break;
+ case 'V':
+ case 'I':
+ case '?':
+ printf("%s Ver 1.0 for %s at %s\n",progname,SYSTEM_TYPE,MACHINE_TYPE);
+ printf("MySQL AB, by Monty\n\n");
+ printf("Usage: %s [-?ABIKLWv] [-m#] [-t#]\n",progname);
+ exit(0);
+ case '#':
+ DBUG_PUSH (++pos);
+ break;
+ }
+ }
+ return 0;
+} /* get_options */
+
+
+/* Get a random number in the interval 0 <= x <= n */
+
+static int rnd(int max_value)
+{
+ return (int) ((rand() & 32767)/32767.0*max_value);
+} /* rnd */
+
+
+void free_record(void *record)
+{
+ my_free(record,MYF(0));
+}
diff -Nrup a/netware/Makefile.am b/netware/Makefile.am
--- a/netware/Makefile.am 2007-10-30 12:06:46 -07:00
+++ b/netware/Makefile.am 2008-04-23 17:03:14 -07:00
@@ -16,14 +16,16 @@
if HAVE_NETWARE
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I..
-LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
- ../dbug/libdbug.a ../strings/libmystrings.a
+LDADD = @CLIENT_EXTRA_LDFLAGS@ \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la
bin_PROGRAMS = mysqld_safe mysql_install_db mysql_test_run libmysql
mysqld_safe_SOURCES= mysqld_safe.c my_manage.c
mysql_install_db_SOURCES= mysql_install_db.c my_manage.c
mysql_test_run_SOURCES= mysql_test_run.c my_manage.c
libmysql_SOURCES= libmysqlmain.c
-libmysql_LDADD = ../libmysql/.libs/libmysqlclient.a \
+libmysql_LDADD = $(top_builddir)/libmysql/.libs/libmysqlclient.a \
@openssl_libs@ @yassl_libs@
netware_build_files = client/mysql.def client/mysqladmin.def \
diff -Nrup a/regex/Makefile.am b/regex/Makefile.am
--- a/regex/Makefile.am 2006-12-30 16:06:33 -08:00
+++ b/regex/Makefile.am 2008-04-23 17:03:14 -07:00
@@ -17,7 +17,7 @@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
noinst_LIBRARIES = libregex.a
-LDADD= libregex.a $(top_builddir)/strings/libmystrings.a
+LDADD= libregex.a $(top_builddir)/strings/libmystrings.la
noinst_HEADERS = cclass.h cname.h regex2.h utils.h engine.c my_regex.h
libregex_a_SOURCES = regerror.c regcomp.c regexec.c regfree.c reginit.c
noinst_PROGRAMS = re
diff -Nrup a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am
--- a/server-tools/instance-manager/Makefile.am 2007-02-18 04:45:24 -08:00
+++ b/server-tools/instance-manager/Makefile.am 2008-04-23 17:03:14 -07:00
@@ -88,9 +88,9 @@ mysqlmanager_LDADD= @CLIENT_EXTRA_LDFLAG
liboptions.la \
libnet.a \
$(top_builddir)/vio/libvio.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a \
- $(top_builddir)/dbug/libdbug.a \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la \
+ $(top_builddir)/dbug/libdbug.la \
@openssl_libs@ @yassl_libs@ @ZLIB_LIBS@
EXTRA_DIST = WindowsService.cpp WindowsService.h IMService.cpp \
diff -Nrup a/sql/Makefile.am b/sql/Makefile.am
--- a/sql/Makefile.am 2008-04-08 01:29:05 -07:00
+++ b/sql/Makefile.am 2008-04-23 17:03:14 -07:00
@@ -33,16 +33,17 @@ noinst_LTLIBRARIES= libndb.la \
udf_example.la
SUPPORTING_LIBS = $(top_builddir)/vio/libvio.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
$(top_builddir)/regex/libregex.a \
- $(top_builddir)/strings/libmystrings.a
+ $(top_builddir)/strings/libmystrings.la
mysqld_DEPENDENCIES= @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la
LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
mysqld_LDADD = libndb.la \
@MYSQLD_EXTRA_LDFLAGS@ \
@pstack_libs@ \
@mysql_plugin_libs@ \
+ @CRYPT_LIBS@ \
$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
$(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
diff -Nrup a/storage/archive/Makefile.am b/storage/archive/Makefile.am
--- a/storage/archive/Makefile.am 2008-01-02 05:00:42 -08:00
+++ b/storage/archive/Makefile.am 2008-04-23 17:03:14 -07:00
@@ -50,17 +50,17 @@ libarchive_a_SOURCES = ha_archive.cc azi
archive_test_SOURCES = archive_test.c azio.c
archive_test_CFLAGS = $(AM_CFLAGS)
-archive_test_LDADD = $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a \
+archive_test_LDADD = $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la \
@ZLIB_LIBS@
archive_test_LDFLAGS = @NOINST_LDFLAGS@
archive_reader_SOURCES = archive_reader.c azio.c
archive_reader_CFLAGS = $(AM_CFLAGS)
-archive_reader_LDADD = $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a \
+archive_reader_LDADD = $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la \
@ZLIB_LIBS@
archive_reader_LDFLAGS = @NOINST_LDFLAGS@
diff -Nrup a/storage/heap/Makefile.am b/storage/heap/Makefile.am
--- a/storage/heap/Makefile.am 2006-12-30 16:06:38 -08:00
+++ b/storage/heap/Makefile.am 2008-04-23 17:03:14 -07:00
@@ -31,14 +31,14 @@ noinst_PROGRAMS = hp_test1 hp_test2
noinst_LIBRARIES = libheap.a
hp_test1_LDFLAGS = @NOINST_LDFLAGS@
hp_test1_LDADD = libheap.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la
hp_test2_LDFLAGS = @NOINST_LDFLAGS@
hp_test2_LDADD = libheap.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la
noinst_HEADERS = heapdef.h ha_heap.h
libheap_a_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \
hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \
diff -Nrup a/storage/myisam/Makefile.am b/storage/myisam/Makefile.am
--- a/storage/myisam/Makefile.am 2006-12-30 16:06:39 -08:00
+++ b/storage/myisam/Makefile.am 2008-04-23 17:03:15 -07:00
@@ -34,55 +34,55 @@ pkglib_LIBRARIES = libmyisam.a
bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump
myisamchk_DEPENDENCIES= $(LIBRARIES)
myisamchk_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@
myisamlog_DEPENDENCIES= $(LIBRARIES)
myisamlog_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@
myisampack_DEPENDENCIES=$(LIBRARIES)
myisampack_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@
noinst_PROGRAMS = mi_test1 mi_test2 mi_test3 rt_test sp_test #ft_test1 ft_eval
noinst_HEADERS = myisamdef.h rt_index.h rt_key.h rt_mbr.h sp_defs.h \
fulltext.h ftdefs.h ft_test1.h ft_eval.h \
ha_myisam.h
mi_test1_DEPENDENCIES= $(LIBRARIES)
mi_test1_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@
mi_test2_DEPENDENCIES= $(LIBRARIES)
mi_test2_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@
mi_test3_DEPENDENCIES= $(LIBRARIES)
mi_test3_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@
#ft_test1_DEPENDENCIES= $(LIBRARIES)
#ft_eval_DEPENDENCIES= $(LIBRARIES)
myisam_ftdump_DEPENDENCIES= $(LIBRARIES)
myisam_ftdump_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@
rt_test_DEPENDENCIES= $(LIBRARIES)
rt_test_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@
sp_test_DEPENDENCIES= $(LIBRARIES)
sp_test_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@
libmyisam_a_SOURCES = mi_open.c mi_extra.c mi_info.c mi_rkey.c \
mi_rnext.c mi_rnext_same.c \
mi_search.c mi_page.c mi_key.c mi_locking.c \
diff -Nrup a/storage/ndb/config/type_ndbapitest.mk.am b/storage/ndb/config/type_ndbapitest.mk.am
--- a/storage/ndb/config/type_ndbapitest.mk.am 2006-12-30 16:06:41 -08:00
+++ b/storage/ndb/config/type_ndbapitest.mk.am 2008-04-23 17:03:15 -07:00
@@ -15,9 +15,9 @@
LDADD += $(top_builddir)/storage/ndb/test/src/libNDBT.a \
$(top_builddir)/storage/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@
INCLUDES += -I$(top_srcdir) \
-I$(top_builddir)/include \
diff -Nrup a/storage/ndb/config/type_ndbapitools.mk.am b/storage/ndb/config/type_ndbapitools.mk.am
--- a/storage/ndb/config/type_ndbapitools.mk.am 2007-06-11 08:51:37 -07:00
+++ b/storage/ndb/config/type_ndbapitools.mk.am 2008-04-23 17:03:15 -07:00
@@ -15,9 +15,9 @@
LDADD += \
$(top_builddir)/storage/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ @ZLIB_LIBS@
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ @ZLIB_LIBS@
INCLUDES += -I$(srcdir) \
-I$(top_builddir)/include \
diff -Nrup a/storage/ndb/src/Makefile.am b/storage/ndb/src/Makefile.am
--- a/storage/ndb/src/Makefile.am 2007-01-19 16:54:51 -08:00
+++ b/storage/ndb/src/Makefile.am 2008-04-23 17:03:15 -07:00
@@ -25,6 +25,9 @@ libndbclient_la_LDFLAGS = -version-info
libndbclient_la_LIBADD = \
ndbapi/libndbapi.la \
+ $(top_builddir)/strings/libmystrings.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
common/transporter/libtransporter.la \
common/debugger/libtrace.la \
common/debugger/signaldata/libsignaldataprint.la \
@@ -32,7 +35,7 @@ libndbclient_la_LIBADD = \
common/mgmcommon/libmgmsrvcommon.la \
common/logger/liblogger.la \
common/portlib/libportlib.la \
- common/util/libgeneral.la
+ common/util/libgeneral.la @ZLIB_LIBS@
windoze-dsp: libndbclient.dsp
diff -Nrup a/storage/ndb/src/common/util/Makefile.am b/storage/ndb/src/common/util/Makefile.am
--- a/storage/ndb/src/common/util/Makefile.am 2008-04-22 12:36:00 -07:00
+++ b/storage/ndb/src/common/util/Makefile.am 2008-04-23 17:03:15 -07:00
@@ -31,9 +31,9 @@ EXTRA_PROGRAMS = testBitmask
testBitmask_SOURCES = testBitmask.cpp
testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \
$(top_builddir)/storage/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la
testBitmask.cpp : Bitmask.cpp
rm -f testBitmask.cpp
diff -Nrup a/storage/ndb/src/cw/cpcd/Makefile.am b/storage/ndb/src/cw/cpcd/Makefile.am
--- a/storage/ndb/src/cw/cpcd/Makefile.am 2007-02-12 17:38:47 -08:00
+++ b/storage/ndb/src/cw/cpcd/Makefile.am 2008-04-23 17:03:15 -07:00
@@ -19,9 +19,9 @@ ndb_cpcd_SOURCES = main.cpp CPCD.cpp Pro
LDADD_LOC = \
$(top_builddir)/storage/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_util.mk.am
diff -Nrup a/storage/ndb/src/kernel/Makefile.am b/storage/ndb/src/kernel/Makefile.am
--- a/storage/ndb/src/kernel/Makefile.am 2006-12-30 16:26:56 -08:00
+++ b/storage/ndb/src/kernel/Makefile.am 2008-04-23 17:03:15 -07:00
@@ -53,9 +53,10 @@ LDADD += \
$(top_builddir)/storage/ndb/src/mgmapi/libmgmapi.la \
$(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \
$(top_builddir)/storage/ndb/src/common/util/libgeneral.la \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la \
+ $(top_builddir)/zlib/libzlt.la @NDB_SCI_LIBS@
windoze-dsp: ndbd.dsp
diff -Nrup a/storage/ndb/src/kernel/blocks/Makefile.am b/storage/ndb/src/kernel/blocks/Makefile.am
--- a/storage/ndb/src/kernel/blocks/Makefile.am 2006-12-30 16:06:42 -08:00
+++ b/storage/ndb/src/kernel/blocks/Makefile.am 2008-04-23 17:03:16 -07:00
@@ -57,9 +57,9 @@ EXTRA_PROGRAMS = ndb_print_file
ndb_print_file_SOURCES = print_file.cpp diskpage.cpp dbtup/tuppage.cpp
ndb_print_file_LDFLAGS = @ndb_bin_am_ldflags@ \
$(top_builddir)/storage/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
diff -Nrup a/storage/ndb/src/kernel/blocks/backup/Makefile.am b/storage/ndb/src/kernel/blocks/backup/Makefile.am
--- a/storage/ndb/src/kernel/blocks/backup/Makefile.am 2006-12-30 16:06:42 -08:00
+++ b/storage/ndb/src/kernel/blocks/backup/Makefile.am 2008-04-23 17:03:16 -07:00
@@ -17,9 +17,9 @@ ndbtools_PROGRAMS = ndb_print_backup_fil
ndb_print_backup_file_SOURCES = read.cpp
ndb_print_backup_file_LDFLAGS = @ndb_bin_am_ldflags@ \
$(top_builddir)/storage/ndb/src/libndbclient.la \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
diff -Nrup a/storage/ndb/src/kernel/blocks/dbdict/Makefile.am b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am
--- a/storage/ndb/src/kernel/blocks/dbdict/Makefile.am 2006-12-30 16:28:02 -08:00
+++ b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am 2008-04-23 17:03:17 -07:00
@@ -19,17 +19,17 @@ include $(top_srcdir)/storage/ndb/config
LDADD += \
$(top_builddir)/storage/ndb/src/common/util/libgeneral.la \
$(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la
ndbtools_PROGRAMS = ndb_print_schema_file
ndb_print_schema_file_SOURCES = printSchemaFile.cpp
ndb_print_schema_file_LDFLAGS = @ndb_bin_am_ldflags@ \
$(top_builddir)/storage/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la
# Don't update the files from bitkeeper
%::SCCS/s.%
diff -Nrup a/storage/ndb/src/kernel/blocks/dbdih/Makefile.am b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am
--- a/storage/ndb/src/kernel/blocks/dbdih/Makefile.am 2006-12-30 16:29:35 -08:00
+++ b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am 2008-04-23 17:03:17 -07:00
@@ -17,9 +17,9 @@ ndbtools_PROGRAMS = ndb_print_sys_file
ndb_print_sys_file_SOURCES = printSysfile.cpp
ndb_print_sys_file_LDFLAGS = @ndb_bin_am_ldflags@ \
$(top_builddir)/storage/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la
include $(top_srcdir)/storage/ndb/config/common.mk.am
diff -Nrup a/storage/ndb/src/kernel/blocks/dblqh/Makefile.am b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am
--- a/storage/ndb/src/kernel/blocks/dblqh/Makefile.am 2007-05-30 11:27:24 -07:00
+++ b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am 2008-04-23 17:03:17 -07:00
@@ -23,9 +23,9 @@ include $(top_srcdir)/storage/ndb/config
ndbd_redo_log_reader_LDFLAGS = @ndb_bin_am_ldflags@ \
$(top_builddir)/storage/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la
# Don't update the files from bitkeeper
%::SCCS/s.%
diff -Nrup a/storage/ndb/src/kernel/blocks/dbtup/Makefile.am b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am
--- a/storage/ndb/src/kernel/blocks/dbtup/Makefile.am 2006-12-30 16:32:00 -08:00
+++ b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am 2008-04-23 17:03:17 -07:00
@@ -20,9 +20,9 @@ EXTRA_PROGRAMS = test_varpage
test_varpage_SOURCES = test_varpage.cpp tuppage.cpp
test_varpage_LDFLAGS = @ndb_bin_am_ldflags@ \
$(top_builddir)/storage/ndb/src/libndbclient.la \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la
# Don't update the files from bitkeeper
%::SCCS/s.%
diff -Nrup a/storage/ndb/src/kernel/vm/Makefile.am b/storage/ndb/src/kernel/vm/Makefile.am
--- a/storage/ndb/src/kernel/vm/Makefile.am 2006-12-30 16:06:42 -08:00
+++ b/storage/ndb/src/kernel/vm/Makefile.am 2008-04-23 17:03:17 -07:00
@@ -65,24 +65,24 @@ ndbd_malloc_impl_test_CXXFLAGS = -DUNIT_
ndbd_malloc_impl_test_SOURCES = ndbd_malloc_impl.cpp
ndbd_malloc_impl_test_LDFLAGS = @ndb_bin_am_ldflags@ \
$(top_builddir)/storage/ndb/src/libndbclient.la \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la
bench_pool_SOURCES = bench_pool.cpp
bench_pool_LDFLAGS = @ndb_bin_am_ldflags@\
libkernel.a ../error/liberror.a \
$(top_builddir)/storage/ndb/src/libndbclient.la \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la
testDynArr256_CXXFLAGS = -DUNIT_TEST
testDynArr256_SOURCES = DynArr256.cpp
testDynArr256_LDFLAGS = @ndb_bin_am_ldflags@ \
libkernel.a ../error/liberror.a \
$(top_builddir)/storage/ndb/src/libndbclient.la \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la
diff -Nrup a/storage/ndb/src/mgmclient/Makefile.am b/storage/ndb/src/mgmclient/Makefile.am
--- a/storage/ndb/src/mgmclient/Makefile.am 2007-08-01 00:23:54 -07:00
+++ b/storage/ndb/src/mgmclient/Makefile.am 2008-04-23 17:03:17 -07:00
@@ -37,9 +37,9 @@ LDADD_LOC = $(noinst_LTLIBRARIES) \
../common/portlib/libportlib.la \
@readline_link@ \
$(top_builddir)/storage/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la \
@TERMCAP_LIB@ @NDB_SCI_LIBS@
ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@
diff -Nrup a/storage/ndb/src/mgmsrv/Makefile.am b/storage/ndb/src/mgmsrv/Makefile.am
--- a/storage/ndb/src/mgmsrv/Makefile.am 2007-07-31 20:07:26 -07:00
+++ b/storage/ndb/src/mgmsrv/Makefile.am 2008-04-23 17:03:18 -07:00
@@ -40,9 +40,9 @@ INCLUDES_LOC = -I$(top_srcdir)/storage/n
LDADD_LOC = $(top_builddir)/storage/ndb/src/mgmclient/CommandInterpreter.lo \
$(top_builddir)/storage/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la \
@readline_link@ \
@NDB_SCI_LIBS@ \
@TERMCAP_LIB@
diff -Nrup a/storage/ndb/src/ndbapi/Makefile.am b/storage/ndb/src/ndbapi/Makefile.am
--- a/storage/ndb/src/ndbapi/Makefile.am 2007-05-29 04:46:54 -07:00
+++ b/storage/ndb/src/ndbapi/Makefile.am 2008-04-23 17:03:18 -07:00
@@ -68,9 +68,10 @@ include $(top_srcdir)/storage/ndb/config
include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
ndberror_check_LDFLAGS = \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la \
+ $(top_builddir)/zlib/libzlt.la
# Don't update the files from bitkeeper
%::SCCS/s.%
diff -Nrup a/storage/ndb/test/run-test/Makefile.am b/storage/ndb/test/run-test/Makefile.am
--- a/storage/ndb/test/run-test/Makefile.am 2008-02-21 05:57:38 -08:00
+++ b/storage/ndb/test/run-test/Makefile.am 2008-04-23 17:03:18 -07:00
@@ -33,9 +33,9 @@ atrt_SOURCES = main.cpp setup.cpp files.
INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/test/include
LDADD_LOC = $(top_builddir)/storage/ndb/test/src/libNDBT.a \
$(top_builddir)/storage/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ \
$(top_builddir)/libmysql_r/libmysqlclient_r.la
atrt_CXXFLAGS = -I$(top_srcdir)/ndb/src/mgmapi \
diff -Nrup a/strings/Makefile.am b/strings/Makefile.am
--- a/strings/Makefile.am 2006-12-30 16:06:43 -08:00
+++ b/strings/Makefile.am 2008-04-23 17:03:18 -07:00
@@ -16,7 +16,7 @@
# This file is public domain and comes with NO WARRANTY of any kind
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
-pkglib_LIBRARIES = libmystrings.a
+noinst_LTLIBRARIES = libmystrings.la
# Exact one of ASSEMBLER_X
if ASSEMBLER_x86
@@ -37,7 +37,7 @@ CSRCS = strxmov.c bmove_upp.c strappend
endif
endif
-libmystrings_a_SOURCES = $(ASRCS) $(CSRCS)
+libmystrings_la_SOURCES = $(ASRCS) $(CSRCS)
noinst_PROGRAMS = conf_to_src
CLEANFILES = str_test uctypedump test_decimal
# Default charset definitions
@@ -55,9 +55,9 @@ EXTRA_DIST = ctype-big5.c ctype-cp932.c
strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \
t_ctype.h my_strchr.c CMakeLists.txt
-libmystrings_a_LIBADD=
-conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c bcmp.c
-conf_to_src_LDADD=
+libmystrings_la_LIBADD=
+conf_to_src_SOURCES = conf_to_src.c
+conf_to_src_LDADD= libmystrings.la
#force static linking of conf_to_src - essential when linking against
#custom installation of libc
conf_to_src_LDFLAGS= @NOINST_LDFLAGS@
@@ -68,15 +68,15 @@ conf_to_src_LDFLAGS= @NOINST_LDFLAGS@
FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
-str_test: str_test.c $(pkglib_LIBRARIES)
- $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LIBRARIES)
+str_test: str_test.c $(noinst_LTLIBRARIES)
+ $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(noinst_LTLIBRARIES)
uctypedump: uctypedump.c
$(LINK) $(INCLUDES) $(srcdir)/uctypedump.c
-test_decimal$(EXEEXT): decimal.c $(pkglib_LIBRARIES)
+test_decimal$(EXEEXT): decimal.c $(noinst_LTLIBRARIES)
$(CP) $(srcdir)/decimal.c ./test_decimal.c
- $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(pkglib_LIBRARIES)
+ $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(noinst_LTLIBRARIES)
$(RM) -f ./test_decimal.c
# Don't update the files from bitkeeper
diff -Nrup a/unittest/mysys/Makefile.am b/unittest/mysys/Makefile.am
--- a/unittest/mysys/Makefile.am 2007-05-28 13:17:46 -07:00
+++ b/unittest/mysys/Makefile.am 2008-04-23 17:03:18 -07:00
@@ -17,9 +17,10 @@ AM_CPPFLAGS = @ZLIB_INCLUDES@ -I$(t
AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
LDADD = $(top_builddir)/unittest/mytap/libmytap.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la \
+ @M_LIBS@ @ZLIB_LIBS@
noinst_PROGRAMS = bitmap-t base64-t my_atomic-t
| Thread |
|---|
| • bk commit into 5.1 tree (mtaylor:1.2579) BUG#29791 | Monty Taylor | 24 Apr |
