Commit 2d8b5199 authored by unknown's avatar unknown
Browse files

manually merged 


client/mysqlbinlog.cc:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
mysql-test/include/varchar.inc:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/mysqlbinlog2.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
mysys/hash.c:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
mysql-test/r/ctype_ucs.result:
  ul
mysql-test/r/drop_temp_table.result:
  ul
mysql-test/r/innodb.result:
  ul
mysql-test/r/insert_select.result:
  ul
mysql-test/r/mix_innodb_myisam_binlog.result:
  ul
mysql-test/r/rpl_change_master.result:
  ul
mysql-test/r/rpl_charset.result:
  ul
mysql-test/r/rpl_error_ignored_table.result:
  ul
mysql-test/r/rpl_flush_log_loop.result:
  ul
mysql-test/r/rpl_flush_tables.result:
  ul
mysql-test/r/rpl_loaddata.result:
  ul
mysql-test/r/rpl_loaddata_rule_m.result:
  ul
mysql-test/r/rpl_log.result:
  ul
mysql-test/r/rpl_max_relay_size.result:
  ul
mysql-test/r/rpl_relayrotate.result:
  ul
mysql-test/r/rpl_replicate_do.result:
  ul
mysql-test/r/rpl_rotate_logs.result:
  ul
mysql-test/r/rpl_temporary.result:
  ul
mysql-test/r/rpl_timezone.result:
  ul
mysql-test/r/rpl_until.result:
  ul
mysql-test/r/rpl_user_variables.result:
  ul
mysql-test/r/user_var.result:
  ul
parents ff4e1476 9297872d

client/mysqlbinlog.cc

+10 −3
Original line number Diff line number Diff line
@@ -1169,7 +1169,14 @@ static int dump_local_log_entries(const char* logname) 
    Log_event* ev = Log_event::read_log_event(file, description_event);

    if (!ev)

    {

      if (file->error)

      /*

        if binlog wasn't closed properly ("in use" flag is set) don't complain

        about a corruption, but issue a "ROLLBACK" to annihilate half-logged

        transaction. Otherwise, treat it as EOF and move to the next binlog.

      */

      if (description_event->flags & LOG_EVENT_BINLOG_IN_USE_F)

        fprintf(result_file, "ROLLBACK;\n");

      else if (file->error)

      {

        fprintf(stderr,

                "Could not read entry at offset %s:"

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -1887,7 +1887,7 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bzero chsize cuserid fchmod fcntl \ 
  getcwd gethostbyaddr_r gethostbyname_r getpass getpassphrase getpwnam \

  getpwuid getrlimit getrusage getwd gmtime_r index initgroups isnan \

  localtime_r locking longjmp lrand48 madvise mallinfo memcpy memmove \

  mkstemp mlockall perror poll pread pthread_attr_create mmap \

  mkstemp mlockall perror poll pread pthread_attr_create mmap getpagesize \

  pthread_attr_getstacksize pthread_attr_setprio pthread_attr_setschedparam \

  pthread_attr_setstacksize pthread_condattr_create pthread_getsequence_np \

  pthread_key_delete pthread_rwlock_rdlock pthread_setprio \

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ typedef long int32; 
#endif

typedef unsigned long	uint32; /* Short for unsigned integer >= 32 bits */

#else

error "Neither int or long is of 4 bytes width"

#error "Neither int or long is of 4 bytes width"

#endif



#if !defined(HAVE_ULONG) && !defined(HAVE_LINUXTHREADS) && !defined(__USE_MISC)

include/my_pthread.h

+3 −3
Original line number Diff line number Diff line
@@ -689,12 +689,12 @@ 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)))

#if defined (__GNUC__) || defined (__cplusplus)

static inline bool thread_safe_dec_and_test(ulong V, pthread_mutex_t *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--;

  res=--V;

  pthread_mutex_unlock(L);

  return res==0;

}

innobase/include/trx0sys.ic

+4 −3
Original line number Diff line number Diff line
@@ -325,7 +325,8 @@ trx_is_active( 
	}



	trx = trx_get_on_id(trx_id);

	if (trx && (trx->conc_state == TRX_ACTIVE)) {

        if (trx && (trx->conc_state == TRX_ACTIVE ||

                        trx->conc_state == TRX_PREPARED)) {



		return(TRUE);

	}