bk commit into 5.0 tree (jimw:1.1910) BUG#11680

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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
  1.1910 05/08/23 11:25:24 jimw@stripped +6 -0
  Fix build using --without-server. (Bug #11680)

  tests/Makefile.am
    1.23 05/08/23 11:25:19 jimw@stripped +1 -2
    Don't link against libmysys explicitly.

  sql/share/Makefile.am
    1.31 05/08/23 11:25:19 jimw@stripped +1 -1
    Allow removal of mysqld_error.h to fail, in case it doesn't exist yet.

  mysys/mf_getdate.c
    1.7 05/08/23 11:25:19 jimw@stripped +1 -1
    Fix usage of gmtime().

  mysys/Makefile.am
    1.65 05/08/23 11:25:19 jimw@stripped +1 -1
    Remove mf_keycache.c from list of files to build (it will be included
    in THREAD_LOBJECTS when appropriate).

  dbug/my_main.c
    1.7 05/08/23 11:25:19 jimw@stripped +2 -0
    Don't try to initialize thread globals if not built with threading.

  configure.in
    1.326 05/08/23 11:25:19 jimw@stripped +3 -4
    Fix directories built using --without-server, and add mf_keycache.o
    to list of objects only built for thread-safe library, since it requires
    threading.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-11680

--- 1.325/configure.in	2005-07-20 09:31:28 -07:00
+++ 1.326/configure.in	2005-08-23 11:25:19 -07:00
@@ -2444,7 +2444,7 @@
 
 dnl This probably should be cleaned up more - for now the threaded
 dnl client is just using plain-old libs.
-sql_client_dirs="libmysql strings regex client"
+sql_client_dirs="strings regex mysys sql/share libmysql client"
 linked_client_targets="linked_libmysql_sources"
 
 if test "$THREAD_SAFE_CLIENT" != "no"
@@ -2482,10 +2482,10 @@
   AC_DEFINE([THREAD], [1],
             [Define if you want to have threaded code. This may be undef on client code])
   # Avoid _PROGRAMS names
-  THREAD_LOBJECTS="thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o
my_thr_init.o"
+  THREAD_LOBJECTS="thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o
my_thr_init.o mf_keycache.o"
   AC_SUBST(THREAD_LOBJECTS)
   server_scripts="mysqld_safe mysql_install_db"
-  sql_server_dirs="strings mysys dbug extra regex"
+  sql_server_dirs="strings dbug extra regex"
 
 
   #
@@ -2593,7 +2593,6 @@
   # END of configuration for optional table handlers
   #
   sql_server_dirs="$sql_server_dirs myisam myisammrg heap vio sql"
-
 fi
 
 # IMPORTANT - do not modify LIBS past this line - this hack is the only way

--- 1.6/dbug/my_main.c	2004-11-09 08:10:02 -08:00
+++ 1.7/dbug/my_main.c	2005-08-23 11:25:19 -07:00
@@ -18,7 +18,9 @@
 #if defined(HAVE_PTHREAD_INIT) && defined(THREAD)
   pthread_init();			/* Must be called before DBUG_ENTER */
 #endif
+#ifdef THREAD
   my_thread_global_init();
+#endif
   {
     DBUG_ENTER ("main");
     DBUG_PROCESS (argv[0]);

--- 1.64/mysys/Makefile.am	2005-07-18 08:36:10 -07:00
+++ 1.65/mysys/Makefile.am	2005-08-23 11:25:19 -07:00
@@ -30,7 +30,7 @@
 			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 \
-			mf_keycache.c mf_keycaches.c my_crc32.c \
+			mf_keycaches.c my_crc32.c \
 			mf_iocache.c mf_iocache2.c mf_cache.c mf_tempfile.c \
 			mf_tempdir.c my_lock.c mf_brkhant.c my_alarm.c \
 			my_malloc.c my_realloc.c my_once.c mulalloc.c \

--- 1.6/mysys/mf_getdate.c	2004-05-11 13:23:04 -07:00
+++ 1.7/mysys/mf_getdate.c	2005-08-23 11:25:19 -07:00
@@ -54,7 +54,7 @@
    if (flag & GETDATE_GMT)
      start_time= localtime(&skr);
    else
-     gmtime(&skr,&tm_tmp);
+     start_time= gmtime(&skr);
 #endif
    if (flag & GETDATE_SHORT_DATE)
      sprintf(to,"%02d%02d%02d",

--- 1.30/sql/share/Makefile.am	2005-05-08 13:47:43 -07:00
+++ 1.31/sql/share/Makefile.am	2005-08-23 11:25:19 -07:00
@@ -33,7 +33,7 @@
 # created. Normally these are created by extra/Makefile
 
 english/errmsg.sys: errmsg.txt
-	rm $(top_builddir)/include/mysqld_error.h
+	rm -f $(top_builddir)/include/mysqld_error.h
 	(cd $(top_builddir)/extra && $(MAKE))
 
 install-data-local:

--- 1.22/tests/Makefile.am	2005-07-05 14:27:37 -07:00
+++ 1.23/tests/Makefile.am	2005-08-23 11:25:19 -07:00
@@ -42,8 +42,7 @@
 LIBS =			@CLIENT_LIBS@
 LDADD =			@CLIENT_EXTRA_LDFLAGS@ \
                         $(top_builddir)/libmysql/libmysqlclient.la
-mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) \
-                        $(top_builddir)/mysys/libmysys.a
+mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS)
 mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix)
 insert_test_SOURCES=       insert_test.c $(yassl_dummy_link_fix)
 select_test_SOURCES=       select_test.c $(yassl_dummy_link_fix)