Commit 80bd3e38 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
include/mysql.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
include/Makefile.am:
  Merge, SUPERCLEANFILES and CLEANFILES has dissapeared in 5.0
parents fa6d7c50 f89efeb5

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -403,8 +403,10 @@ heap/hp_test2 
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
@@ -704,6 +706,7 @@ mysql-test/r/bdb-deadlock.err 
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

configure.in

+4 −0
Original line number Diff line number Diff line
@@ -449,6 +449,10 @@ AC_SUBST(DOXYGEN) 
AC_SUBST(PDFLATEX)

AC_SUBST(MAKEINDEX)



# 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")

include/Makefile.am

+24 −2
Original line number Diff line number Diff line
@@ -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 raid.h \
@@ -34,7 +34,7 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.h \ 
			my_user.h 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)
@@ -52,5 +52,27 @@ my_config.h: ../config.h 
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.%

include/mysql.h

+11 −0
Original line number Diff line number Diff line
@@ -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

include/mysql_h_abi.ic

0 → 100644
+1244 −0

File added.

Preview size limit exceeded, changes collapsed.