Updated manual about embedded version.

Speed up column-completion in 'mysql'
Don't use ISAM if HAVE_ISAM is not defined
A lot of fixes for the embedded version.  All libraries are now included in libmysqld.a
Changed arguments to convert_dirname() to make it more general.
Renamed files in the 'merge' directory to all use a common prefix.
Don't compile both assembler and C functions on x86


BitKeeper/deleted/.del-mf_pack2.c~f07795bbcf57be7:
  Delete: mysys/mf_pack2.c
Docs/manual.texi:
  Updated chapter about embedded version
acinclude.m4:
  Fix for using BDB and InnoDB with embedded
client/completion_hash.cc:
  Speed up memory allocation
client/completion_hash.h:
  Speed up memory allocation
client/mysql.cc:
  Speed up memory allocation
client/mysqldump.c:
  Fix to use now convert_dirname
client/mysqltest.c:
  Fixed memory allocation bugs.
  Added --basedir=#, --compress=#, --server-arg, --server-file.
  Fixes for embedded version
  Changed silent mode to -s instead of -q
include/my_global.h:
  Update to use HAVE_ISAM
include/my_sys.h:
  Cleanup of fn_format()
include/mysql.h:
  Prepare FIELD struct for 4.1
include/mysql_embed.h:
  Don't use ISAM in embedded version
innobase/include/srv0srv.h:
  Make InnoDB startup/shutdown silent in embedded version
innobase/log/log0log.c:
  Make InnoDB startup/shutdown silent in embedded version
innobase/srv/srv0srv.c:
  Make InnoDB startup/shutdown silent in embedded version
innobase/srv/srv0start.c:
  Make InnoDB startup/shutdown silent in embedded version
isam/isamlog.c:
  new convert_dirname
libmysql/libmysql.c:
  Prepare for 4.1
libmysqld/Makefile.am:
  Changed to create one libmysqld.a file that includes all other libraries.
libmysqld/examples/Makefile.am:
  Changed to use new libmysqld.a
libmysqld/examples/test-run:
  Lot's of fixes to get new mysqltest with embedded MySQL to work.
libmysqld/lib_sql.cc:
  Changed type of arguments for mysql_server_init() to make code more portable.
libmysqld/libmysqld.c:
  Cleanup
merge/Makefile.am:
  Rename to use common prefix.
merge/mrg_close.c:
  Rename to use common prefix.
merge/mrg_create.c:
  Rename to use common prefix.
merge/mrg_def.h:
  Rename to use common prefix.
merge/mrg_delete.c:
  Rename to use common prefix.
merge/mrg_extra.c:
  Rename to use common prefix.
merge/mrg_info.c:
  Rename to use common prefix.
merge/mrg_locking.c:
  Rename to use common prefix.
merge/mrg_open.c:
  Rename to use common prefix.
merge/mrg_panic.c:
  Rename to use common prefix.
merge/mrg_rrnd.c:
  Rename to use common prefix.
merge/mrg_rsame.c:
  Rename to use common prefix.
merge/mrg_static.c:
  Rename to use common prefix.
merge/mrg_update.c:
  Rename to use common prefix.
myisam/myisamlog.c:
  Use new convert_dirname
myisammrg/Makefile.am:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_close.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_create.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_def.h:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_delete.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_extra.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_info.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_locking.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_open.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_panic.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_queue.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rfirst.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rkey.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rlast.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rnext.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rprev.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rrnd.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rsame.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_static.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_update.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_write.c:
  Renamed mymrgdef.h -> myrg_def.h
mysql-test/include/master-slave.inc:
  Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/mysql-test-run.sh:
  cleanup
mysql-test/r/auto_increment.result:
  Cleanup of tests for embedded version
mysql-test/r/func_system.result:
  Cleanup of tests for embedded version
mysql-test/r/isam.result:
  Cleanup of tests for embedded version
mysql-test/r/lock.result:
  Cleanup of tests for embedded version
mysql-test/r/show_check.result:
  Cleanup of tests for embedded version
mysql-test/t/auto_increment.test:
  Cleanup of tests for embedded version
mysql-test/t/backup.test:
  Cleanup of tests for embedded version
mysql-test/t/count_distinct2-master.opt:
  Cleanup of tests for embedded version
mysql-test/t/count_distinct2.test:
  Cleanup of tests for embedded version
mysql-test/t/create.test:
  Cleanup of tests for embedded version
mysql-test/t/flush.test:
  Cleanup of tests for embedded version
mysql-test/t/func_system.test:
  Cleanup of tests for embedded version
mysql-test/t/isam.test:
  Cleanup of tests for embedded version
mysql-test/t/kill.test:
  Cleanup of tests for embedded version
mysql-test/t/lock.test:
  Cleanup of tests for embedded version
mysql-test/t/order_fill_sortbuf-master.opt:
  Cleanup of tests for embedded version
mysql-test/t/rpl000015.test:
  Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000016.test:
  Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000017.test:
  Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000018.test:
  Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/show_check.test:
  Move ISAM specific tests to isam.test
mysql-test/t/status.test:
  Cleanup of tests for embedded version
mysql-test/t/tablelock.test:
  Cleanup
mysys/Makefile.am:
  Removed not used mf_pack2.c
mysys/charset.c:
  new convert_dirname
mysys/default.c:
  new convert_dirname
mysys/mf_dirname.c:
  Changed convert_dirname() to be more general
mysys/mf_format.c:
  Changed bit flags to fn_format() to defines.
  Added handling of relative filenames
BitKeeper/etc/ignore:
  Added libmysqld/examples/test-gdbinit scripts/mysql_explain_log to the ignore list
mysys/mf_pack.c:
  new convert_dirname
mysys/mf_tempfile.c:
  new convert_dirname
scripts/Makefile.am:
  Adde mysql_explain_log
scripts/mysql_config.sh:
  Added support of --libmysqld-libs
sql/Makefile.am:
  Fix to use 'innodb_system_libs'
sql/ha_innobase.cc:
  Make InnoDB startup/shutdown silent in embedded version
sql/ha_isam.cc:
  Added handling of HAVE_ISAM
sql/ha_isammrg.cc:
  Added handling of HAVE_ISAM
sql/ha_myisam.cc:
  Handle relative paths;  Needed to support BACKUP TABLE in embedded version
sql/ha_myisammrg.cc:
  Rename of filenames
sql/handler.cc:
  Added handling of HAVE_ISAM
sql/item_func.cc:
  Fix for ecc (Intel Compiler)
sql/mysql_priv.h:
  Added global variable 'mysql_embedded'
sql/mysqld.cc:
  Use HAVE_ISAM
sql/sql_parse.cc:
  Use new convert_dirname
sql/sql_select.cc:
  Fix for ecc (Intel Compiler)
sql/sql_table.cc:
  Added handling of relative filenames
strings/Makefile.am:
  Don't compile both assembler and C functions on x86
strings/bchange.c:
  cleanup

1 files changed, 45 insertions, 34 deletions

diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index e39cebff04a..275a761e5ac 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -17,27 +17,23 @@
 #
 # This file is public domain and comes with NO WARRANTY of any kind
 
-MYSQLDATAdir =			$(localstatedir)
-MYSQLSHAREdir =			$(pkgdatadir)
-MYSQLBASEdir=			$(prefix)
+MYSQLDATAdir =		$(localstatedir)
+MYSQLSHAREdir =		$(pkgdatadir)
+MYSQLBASEdir=		$(prefix)
 
 DEFS =			-DEMBEDDED_LIBRARY -DMYSQL_SERVER \
 			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
 			-DDATADIR="\"$(MYSQLDATAdir)\"" \
 			-DSHAREDIR="\"$(MYSQLSHAREdir)\""
-INCLUDES = @MT_INCLUDES@ @bdb_includes@ -I$(srcdir)/../include -I../include \
-	-I$(srcdir)/.. -I$(top_srcdir) -I.. -I../sql -I../regex
+INCLUDES=		@MT_INCLUDES@ @bdb_includes@ -I$(srcdir)/../include \
+			-I../include -I$(srcdir)/.. -I$(top_srcdir) -I.. \
+			-I../sql -I../regex
 
-
-## XXX: should we use client or server LDFLAGS for libmysqld?
-LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmysqld.la
-pkglib_LTLIBRARIES =	libmysqld.la
+noinst_LIBRARIES =	libmysqld_int.a
+pkglib_LIBRARIES =	libmysqld.a
 SUBDIRS =		. examples
-libmysqld_la_SOURCES=	libmysqld.c lib_sql.cc lib_load.cc
-
+libmysqld_sources=	libmysqld.c lib_sql.cc lib_load.cc
 libmysqlsources =	errmsg.c get_password.c password.c
-## XXX: we should not have to duplicate info from the sources list
-libmysqlobjects =	errmsg.lo get_password.lo password.lo
 
 noinst_HEADERS =	embedded_priv.h
 
@@ -58,37 +54,52 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \
 	sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \
 	unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc
 
-## XXX: we should not have to duplicate info from the sources list
-sqlobjects = convert.lo derror.lo field.lo field_conv.lo filesort.lo \
-	ha_innobase.lo ha_berkeley.lo ha_heap.lo ha_isam.lo ha_isammrg.lo \
-	ha_myisam.lo ha_myisammrg.lo handler.lo sql_handler.lo \
-	hostname.lo init.lo \
-	item.lo item_buff.lo item_cmpfunc.lo item_create.lo \
-	item_func.lo item_strfunc.lo item_sum.lo item_timefunc.lo \
-	item_uniq.lo key.lo lock.lo log.lo log_event.lo md5.lo \
-	mini_client.lo net_pkg.lo net_serv.lo opt_ft.lo opt_range.lo \
-	opt_sum.lo procedure.lo records.lo slave.lo sql_acl.lo \
-	sql_analyse.lo sql_base.lo sql_cache.lo sql_class.lo \
-	sql_crypt.lo sql_db.lo sql_delete.lo sql_insert.lo sql_lex.lo \
-	sql_list.lo sql_manager.lo sql_map.lo sql_parse.lo \
-	sql_rename.lo sql_repl.lo sql_select.lo sql_show.lo \
-	sql_string.lo sql_table.lo sql_test.lo sql_udf.lo \
-	sql_update.lo sql_yacc.lo table.lo thr_malloc.lo time.lo \
-	unireg.lo uniques.lo stacktrace.lo sql_union.lo hash_filo.lo
-
 EXTRA_DIST = lib_vio.c
 
+libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)
+
 # automake misses these
 sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy
 
-libmysqld_la_LIBADD = $(sqlobjects) $(libmysqlobjects)
+# The following libraries should be included in libmysqld.a
+INC_LIB=	$(top_builddir)/regex/libregex.a \
+		$(top_builddir)/myisam/libmyisam.a \
+		$(top_builddir)/myisammrg/libmyisammrg.a \
+		$(top_builddir)/heap/libheap.a \
+		@innodb_libs@ @bdb_libs_with_path@ \
+		$(top_builddir)/mysys/libmysys.a \
+		$(top_builddir)/strings/libmystrings.a \
+		$(top_builddir)/dbug/libdbug.a \
+		$(top_builddir)/regex/libregex.a
+
+#
+# To make it easy for the end user to use the embedded library we 
+# generate a total libmysqld.a from all library files, 
+
+libmysqld.a:	libmysqld_int.a $(INC_LIB)
+		if test ! -d tmp ; then mkdir tmp ; fi
+		rm -f $@ libmysqld_int2.a tmp/*.o tmp/*.a
+		cp $(INC_LIB) tmp
+		cp libmysqld_int.a libmysqld_int2.a ; \
+		cd tmp ; \
+		for file in *.a ; do \
+		  bfile=`basename $$file .a` ; \
+		  ar x $$file; \
+		  for obj in *.o ; do mv $$obj $${bfile}_$$obj ; done ; \
+		  ar q ../libmysqld_int2.a *.o ; \
+		  rm *.o ; \
+		done
+		mv libmysqld_int2.a libmysqld.a
+		rm tmp/*
+		$(RANLIB) libmysqld.a
+
 ## XXX: any time the client interface changes, we'll need to bump
 ## the version info for libmysqld; however, it's possible for the
 ## libmysqld interface to change without affecting the standard
 ## libmysqlclient interface.  Should we make a separate version
 ## string for the two?
-libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@
-CLEANFILES =		$(libmysqld_la_LIBADD) libmysqld.la
+#libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@
+#CLEANFILES =		$(libmysqld_la_LIBADD) libmysqld.la
 
 # This is called from the toplevel makefile
 link_sources: