bk commit into 5.1 tree (msvensson:1.2338)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 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-10-24 22:02:33+02:00, msvensson@neptunus.(none) +5 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.1810.2078.89

  BitKeeper/etc/ignore@stripped, 2006-10-24 22:00:36+02:00, msvensson@neptunus.(none) +0 -0
    auto-union
    MERGE: 1.210.1.26

  configure.in@stripped, 2006-10-24 22:02:30+02:00, msvensson@neptunus.(none) +0 -0
    SCCS merged
    MERGE: 1.245.1.156

  include/Makefile.am@stripped, 2006-10-24 22:00:46+02:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.52.2.4

  include/mysql.h@stripped, 2006-10-24 22:00:46+02:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.154.1.10

  mysql-test/mysql-test-run.pl@stripped, 2006-10-24 22:00:46+02:00, msvensson@neptunus.(none)
+0 -0
    Auto merged
    MERGE: 1.30.1.111

# 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.1-new-maint/RESYNC

--- 1.388/configure.in	2006-10-24 22:02:39 +02:00
+++ 1.389/configure.in	2006-10-24 22:02:39 +02:00
@@ -415,6 +415,10 @@
 AC_SUBST(PERL)
 AC_SUBST(PERL5)
 
+# icheck, used for ABI check
+AC_PATH_PROG(ICHECK, icheck, no)
+AC_SUBST(ICHECK)
+
 # Lock for PS
 AC_PATH_PROG(PS, ps, ps)
 AC_MSG_CHECKING("how to check if pid exists")

--- 1.67/include/Makefile.am	2006-10-24 22:02:39 +02:00
+++ 1.68/include/Makefile.am	2006-10-24 22:02:39 +02:00
@@ -15,7 +15,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA
 
-BUILT_SOURCES =		mysql_version.h m_ctype.h my_config.h
+BUILT_SOURCES =		mysql_version.h m_ctype.h my_config.h mysql_h.ic
 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 \
@@ -36,7 +36,7 @@
 			my_libwrap.h
 
 # mysql_version.h are generated
-CLEANFILES =            mysql_version.h my_config.h readline openssl
+CLEANFILES =            mysql_version.h my_config.h readline openssl mysql_h.ic
 
 # Some include files that may be moved and patched by configure
 DISTCLEANFILES =	sched.h $(CLEANFILES)
@@ -53,6 +53,28 @@
 # generated by configure from the .h.in files
 dist-hook:
 	$(RM) -f $(distdir)/mysql_version.h $(distdir)/my_config.h
+
+#
+# Rules for checking that ABI has not changed
+#
+
+# Create a icheck file for mysql.h
+mysql_h.ic: mysql.h
+	@set -x; \
+	if [ @ICHECK@ != no ] ; then \
+	  @ICHECK@ --canonify -o $@ mysql.h; \
+	fi;
+
+# Compare the icheck file to the reference
+check_abi: mysql_h.ic
+	@set -x; \
+	if [ @ICHECK@ != no ] ; then \
+	  @ICHECK@ --compare mysql_h.ic mysql_h_abi.ic; \
+	fi; \
+	touch check_abi;
+
+all: check_abi
+
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

--- 1.168/include/mysql.h	2006-10-24 22:02:39 +02:00
+++ 1.169/include/mysql.h	2006-10-24 22:02:39 +02:00
@@ -14,6 +14,17 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+/*
+  This file defines the client API to MySQL and also the ABI of the
+  dynamically linked libmysqlclient.
+
+  The ABI should never be changed in a released product of MySQL
+  thus you need to take great care when changing the file. In case
+  the file is changed so the ABI is broken, you must also
+  update the SHAREDLIB_MAJOR_VERSION in configure.in .
+
+*/
+
 #ifndef _mysql_h
 #define _mysql_h
 

--- 1.208/mysql-test/mysql-test-run.pl	2006-10-24 22:02:39 +02:00
+++ 1.209/mysql-test/mysql-test-run.pl	2006-10-24 22:02:39 +02:00
@@ -2624,6 +2624,7 @@
   mtr_add_arg($args, "--skip-innodb");
   mtr_add_arg($args, "--skip-ndbcluster");
   mtr_add_arg($args, "--tmpdir=.");
+  mtr_add_arg($args, "--core-file");
 
   if ( $opt_debug )
   {

--- 1.261/BitKeeper/etc/ignore	2006-10-24 22:02:39 +02:00
+++ 1.262/BitKeeper/etc/ignore	2006-10-24 22:02:39 +02:00
@@ -567,8 +567,10 @@
 help
 help.c
 help.h
+include/check_abi
 include/my_config.h
 include/my_global.h
+include/mysql_h.ic
 include/mysql_version.h
 include/mysqld_ername.h
 include/mysqld_error.h
@@ -1260,6 +1262,7 @@
 mysql-test/r/bdb.err
 mysql-test/r/bdb.log
 mysql-test/r/bdb_cache.err
+mysql-test/r/blackhole.log
 mysql-test/r/client_test.err
 mysql-test/r/csv.err
 mysql-test/r/ctype_ucs.err