Commit 46aad963 authored by unknown's avatar unknown
Browse files

Merge 


sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/handler.cc:
  SCCS merged
parents b419262f cd0a50bf

config/ac-macros/ha_isam.m4

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
AC_DEFUN([MYSQL_CHECK_ISAM], [

  AC_ARG_WITH([isam], [

  --with-isam             Enable the ISAM table type],

    [with_isam="$withval"],

    [with_isam=no])



  isam_libs=

  if test X"$with_isam" = X"yes"

  then

    AC_DEFINE([HAVE_ISAM], [1], [Using old ISAM tables])

    isam_libs="\$(top_builddir)/isam/libnisam.a\

 \$(top_builddir)/merge/libmerge.a"

  fi

  AC_SUBST(isam_libs)

])

include/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \ 
			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \

			mysql_time.h $(BUILT_SOURCES)

noinst_HEADERS =	config-win.h config-os2.h config-netware.h \

			nisam.h heap.h merge.h my_bitmap.h\

			heap.h my_bitmap.h\

			myisam.h myisampack.h myisammrg.h ft_global.h\

			mysys_err.h my_base.h help_start.h help_end.h \

			my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \

include/config-win.h

+0 −1
Original line number Diff line number Diff line
@@ -351,7 +351,6 @@ inline double ulonglong2double(ulonglong value) 
#define DO_NOT_REMOVE_THREAD_WRAPPERS

#define thread_safe_increment(V,L) InterlockedIncrement((long*) &(V))

#define thread_safe_decrement(V,L) InterlockedDecrement((long*) &(V))

#define thread_safe_dec_and_test(V, L) thread_safe_decrement(V,L)

/* The following is only used for statistics, so it should be good enough */

#ifdef __NT__  /* This should also work on Win98 but .. */

#define thread_safe_add(V,C,L) InterlockedExchangeAdd((long*) &(V),(C))

include/m_ctype.h

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ typedef struct my_charset_handler_st 
			 int base, char **e, int *err);

  double      (*strntod)(struct charset_info_st *, char *s, uint l, char **e,

			 int *err);

  longlong (*my_strtoll10)(struct charset_info_st *cs,

  longlong    (*strtoll10)(struct charset_info_st *cs,

                           const char *nptr, char **endptr, int *error);

  ulong        (*scan)(struct charset_info_st *, const char *b, const char *e,

		       int sq);

include/merge.h

deleted100644 → 0
+0 −93
Original line number Diff line number Diff line 
/* Copyright (C) 2000 MySQL AB



   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 */



/* This file should be included when using merge_isam_funktions */

/* Author: Michael Widenius */



#ifndef _merge_h

#define _merge_h

#ifdef	__cplusplus

extern "C" {

#endif



#ifndef _my_base_h

#include <my_base.h>

#endif

#ifndef _nisam_h

#include <nisam.h>

#endif



#define MRG_NAME_EXT	".MRG"



	/* Param to/from mrg_info */



typedef struct st_mrg_info		/* Struct from h_info */

{

  ulonglong records;			/* Records in database */

  ulonglong deleted;			/* Deleted records in database */

  ulonglong recpos;			/* Pos for last used record */

  ulonglong data_file_length;

  uint	reclength;			/* Recordlength */

  int	errkey;				/* With key was dupplicated on err */

  uint	options;			/* HA_OPTION_... used */

} MERGE_INFO;



typedef struct st_mrg_table_info

{

  N_INFO *table;

  ulonglong file_offset;

} MRG_TABLE;



typedef struct st_merge

{

  MRG_TABLE *open_tables,*current_table,*end_table,*last_used_table;

  ulonglong records;			/* records in tables */

  ulonglong del;			/* Removed records */

  ulonglong data_file_length;

  uint	 tables,options,reclength;

  my_bool cache_in_use;

  LIST	open_list;

} MRG_INFO;



typedef ulong mrg_off_t;



	/* Prototypes for merge-functions */



extern int mrg_close(MRG_INFO *file);

extern int mrg_delete(MRG_INFO *file,const byte *buff);

extern MRG_INFO *mrg_open(const char *name,int mode,int wait_if_locked);

extern int mrg_panic(enum ha_panic_function function);

extern int mrg_rfirst(MRG_INFO *file,byte *buf,int inx);

extern int mrg_rkey(MRG_INFO *file,byte *buf,int inx,const byte *key,

		       uint key_len, enum ha_rkey_function search_flag);

extern int mrg_rrnd(MRG_INFO *file,byte *buf, mrg_off_t pos);

extern int mrg_rsame(MRG_INFO *file,byte *record,int inx);

extern int mrg_update(MRG_INFO *file,const byte *old,const byte *new_rec);

extern int mrg_info(MRG_INFO *file,MERGE_INFO *x,int flag);

extern int mrg_lock_database(MRG_INFO *file,int lock_type);

extern int mrg_create(const char *name,const char **table_names);

extern int mrg_extra(MRG_INFO *file,enum ha_extra_function function);

extern ha_rows mrg_records_in_range(MRG_INFO *info,int inx,

				    const byte *start_key,uint start_key_len,

				    enum ha_rkey_function start_search_flag,

				    const byte *end_key,uint end_key_len,

				    enum ha_rkey_function end_search_flag);



extern mrg_off_t mrg_position(MRG_INFO *info);

#ifdef	__cplusplus

}

#endif

#endif