Commit fc8108ad authored by jcole@tetra.spaceapes.com's avatar jcole@tetra.spaceapes.com
Browse files

Merge work.mysql.com:/home/bk/mysql 

into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
parents dadbca78 d25308e4

Docs/manual.texi

+382 −64

File changed.

Preview size limit exceeded, changes collapsed.

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. 
AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

AM_INIT_AUTOMAKE(mysql, 3.23.33)

AM_INIT_AUTOMAKE(mysql, 3.23.34)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -746,7 +746,7 @@ case $SYSTEM_TYPE in 
    ;;

  *bsdi*)

    echo "Adding fix for BSDI"

    CFLAGS="$CFLAGS -D__BSD__"

    CFLAGS="$CFLAGS -D__BSD__ -DHAVE_BROKEN_REALPATH"

    AC_DEFINE_UNQUOTED(SOCKOPT_OPTLEN_TYPE, size_t)

    ;;

   *sgi-irix6*)

include/my_base.h

+2 −1
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ enum ha_extra_function { 
  HA_EXTRA_NO_ROWS,			/* Don't write rows */

  HA_EXTRA_RESET_STATE,			/* Reset positions */

  HA_EXTRA_IGNORE_DUP_KEY,		/* Dup keys don't rollback everything*/

  HA_EXTRA_NO_IGNORE_DUP_KEY

  HA_EXTRA_NO_IGNORE_DUP_KEY,

  HA_EXTRA_DONT_USE_CURSOR_TO_UPDATE	/* Cursor will not be used for update */

};



	/* The following is parameter to ha_panic() */

include/thr_lock.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ extern ulong locks_immediate,locks_waited ; 
enum thr_lock_type { TL_IGNORE=-1,

		     TL_UNLOCK,			/* UNLOCK ANY LOCK */

		     TL_READ,			/* Read lock */

		     TL_READ_WITH_SHARED_LOCKS,

		     /* High prior. than TL_WRITE. Allow concurrent insert */

		     TL_READ_HIGH_PRIORITY,

		     /* READ, Don't allow concurrent insert */

innobase/Makefile.am

0 → 100644
+26 −0
Original line number Diff line number Diff line 
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB

# & Innobase Oy

#

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

# the Free Software Foundation; either version 2 of the License, or

# (at your option) any later version.

# 

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

# GNU General Public License for more details.

# 

# You should have received a copy of the GNU General Public License

# along with this program; if not, write to the Free Software

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA



# Process this file with automake to create Makefile.in



AUTOMAKE_OPTIONS =	foreign

TAR =			gtar



SUBDIRS =		os ut btr buf com data dict dyn eval fil fsp fut \

			ha ibuf lock log mach mem mtr odbc page pars que \

			read rem row srv sync thr trx usr