Commit cd0a50bf authored by unknown's avatar unknown
Browse files

remove the rest of isam/merge references 

fix a race condition in TC_LOG_BINLOG::unlog


include/Makefile.am:
  remove the rest of isam/merge references
include/config-win.h:
  unused and abused macro removed
include/my_pthread.h:
  unused and abused macro removed
include/my_sys.h:
  MY_IGNORE_BADFD flag
include/mysql_embed.h:
  remove the rest of isam/merge references
mysql-test/r/replace.result:
  remove the rest of isam/merge references
mysql-test/t/replace.test:
  remove the rest of isam/merge references
mysql-test/t/xa.test:
  comment
mysys/my_sync.c:
  MY_IGNORE_BADFD flag
sql/handler.cc:
  remove the rest of isam/merge references
sql/log.cc:
  fix a race condition in TC_LOG_BINLOG::unlog
  preparation for binlog group commit
sql/mysql_priv.h:
  remove duplicates
sql/mysqld.cc:
  remove the rest of isam/merge references
sql/opt_range.cc:
  remove the rest of isam/merge references
sql/set_var.cc:
  hide unused variables. simplify sync_binlog code
sql/sql_base.cc:
  remove the rest of isam/merge references
sql/sql_class.h:
  cleanup
parent 5dbcb155

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/my_pthread.h

+0 −17
Original line number Diff line number Diff line
@@ -678,7 +678,6 @@ extern pthread_t shutdown_th, main_th, signal_th; 
#ifdef HAVE_ATOMIC_ADD

#define thread_safe_increment(V,L) atomic_inc((atomic_t*) &V)

#define thread_safe_decrement(V,L) atomic_dec((atomic_t*) &V)

#define thread_safe_dec_and_test(V, L) atomic_dec_and_test((atomic_t*) &V)

#define thread_safe_add(V,C,L)     atomic_add((C),(atomic_t*) &V)

#define thread_safe_sub(V,C,L)     atomic_sub((C),(atomic_t*) &V)

#else
@@ -689,22 +688,6 @@ extern pthread_t shutdown_th, main_th, signal_th; 
#define thread_safe_add(V,C,L) (pthread_mutex_lock((L)), (V)+=(C), pthread_mutex_unlock((L)))

#define thread_safe_sub(V,C,L) \

        (pthread_mutex_lock((L)), (V)-=(C), pthread_mutex_unlock((L)))

#ifdef __cplusplus

static inline bool thread_safe_dec_and_test(ulong &V, pthread_mutex_t *L)

{

  ulong res;

  pthread_mutex_lock(L);

  res=--V;

  pthread_mutex_unlock(L);

  return res==0;

}

#else

/*

  what should we do ? define it as static ?

  a regular function somewhere in mysys/  ?

  for now it's only used in c++ code, so there's no need to bother

*/

#endif

#endif /* HAVE_ATOMIC_ADD */

#ifdef SAFE_STATISTICS

#define statistic_increment(V,L)   thread_safe_increment((V),(L))

include/my_sys.h

+5 −6
Original line number Diff line number Diff line
@@ -54,10 +54,9 @@ extern int NEAR my_errno; /* Last error in mysys */ 
#define MY_FAE		8	/* Fatal if any error */

#define MY_WME		16	/* Write message on error */

#define MY_WAIT_IF_FULL 32	/* Wait and try again if disk full error */

#define MY_RAID         64      /* Support for RAID (not the "Johnson&Johnson"-s one ;) */

#define MY_FULL_IO     512      /* For my_read - loop intil I/O

				   is complete

				*/

#define MY_IGNORE_BADFD 32      /* my_sync: ignore 'bad descriptor' errors */

#define MY_RAID         64      /* Support for RAID */

#define MY_FULL_IO     512      /* For my_read - loop intil I/O is complete */

#define MY_DONT_CHECK_FILESIZE 128 /* Option to init_io_cache() */

#define MY_LINK_WARNING 32	/* my_redel() gives warning if links */

#define MY_COPYTIME	64	/* my_redel() copys time */
@@ -72,7 +71,7 @@ extern int NEAR my_errno; /* Last error in mysys */ 
#define MY_FREE_ON_ERROR 128	/* my_realloc() ; Free old ptr on error */

#define MY_HOLD_ON_ERROR 256	/* my_realloc() ; Return old ptr on error */

#define MY_THREADSAFE	128	/* pread/pwrite:  Don't allow interrupts */

#define MY_DONT_OVERWRITE_FILE 1024	/* my_copy; Don't overwrite file */

#define MY_DONT_OVERWRITE_FILE 1024	/* my_copy: Don't overwrite file */



#define MY_CHECK_ERROR	1	/* Params to my_end; Check open-close */

#define MY_GIVE_INFO	2	/* Give time info about process*/

include/mysql_embed.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#undef HAVE_PSTACK				/* No stacktrace */

#undef HAVE_DLOPEN				/* No udf functions */

#undef HAVE_OPENSSL

#undef HAVE_ISAM

#undef HAVE_SMEM				/* No shared memory */

#undef HAVE_NDBCLUSTER_DB /* No NDB cluster */