bk commit into 5.0 tree (msvensson:1.2348)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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, 2006-11-01 16:11:56+01:00, msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.1616.2697.88

  include/Makefile.am@stripped, 2006-11-01 16:11:54+01:00, msvensson@neptunus.(none) +2 -4
    Manual merge
    MERGE: 1.48.1.3

  include/mysql_h.ic@stripped, 2006-11-01 16:11:30+01:00, msvensson@neptunus.(none) +3 -158
    C
    Use local
    MERGE: 1.1.1.2

  include/mysql_h.ic@stripped, 2006-11-01 16:08:58+01:00, msvensson@neptunus.(none) +0 -0
    Merge rename: include/mysql_h_abi.ic -> include/mysql_h.ic

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint/RESYNC

--- 1.59/include/Makefile.am	2006-11-01 16:12:01 +01:00
+++ 1.60/include/Makefile.am	2006-11-01 16:12:01 +01:00
@@ -15,14 +15,14 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA
 
-BUILT_SOURCES =		mysql_version.h my_config.h mysql_h.ic
+BUILT_SOURCES =		mysql_version.h my_config.h abi_check
 pkginclude_HEADERS =	my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \
 			mysql.h mysql_com.h mysql_embed.h \
 		  	my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
 			errmsg.h my_global.h my_net.h my_alloc.h \
 			my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
 			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
-			mysql_time.h m_ctype.h $(BUILT_SOURCES)
+			sql_state.h mysql_time.h m_ctype.h $(BUILT_SOURCES)
 noinst_HEADERS =	config-win.h config-os2.h config-netware.h \
 			heap.h my_bitmap.h\
 			myisam.h myisampack.h myisammrg.h ft_global.h\
@@ -36,6 +36,8 @@ noinst_HEADERS =	config-win.h config-os2
 # Remove built files and the symlinked directories
 CLEANFILES =            $(BUILT_SOURCES) readline openssl
 
+EXTRA_DIST =            mysql_h.ic
+
 # Some include files that may be moved and patched by configure
 DISTCLEANFILES =	sched.h $(CLEANFILES)
 
@@ -56,25 +58,17 @@ dist-hook:
 # Rules for checking that ABI has not changed
 #
 
-# Create a icheck file for mysql.h
-mysql_h.ic: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \
-            my_alloc.h typelib.h
-	@set -x; \
-	if [ @ICHECK@ != no ] ; then \
-	  @ICHECK@ --canonify --skip-from-re /usr/ -o $@ mysql.h; \
-	else \
-	  touch $@; \
-	fi;
-
-# Compare the icheck file to the reference
-check_abi: mysql_h.ic
+# Create a icheck file and compare it to the reference
+abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \
+           my_alloc.h typelib.h
 	@set -ex; \
 	if [ @ICHECK@ != no ] ; then \
-	  @ICHECK@ --compare mysql_h.ic mysql_h_abi.ic; \
+	  @ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \
+	  @ICHECK@ --compare mysql_h.ic $@.ic; \
 	fi; \
-	touch check_abi;
+	touch abi_check;
 
-all: check_abi
+all: abi_check
 
 
 # Don't update the files from bitkeeper