Commit 042448aa authored by unknown's avatar unknown
Browse files

query_id and my_xid -> ulonglong 

fix for binlog+autocommit+tclog
comments, style fixes


libmysqld/libmysqld.rc:
  Change mode to -rw-rw-r--
libmysqld/resource.h:
  Change mode to -rw-rw-r--
configure.in:
  check for getpagesize
include/my_global.h:
  typo ?
include/my_pthread.h:
  bug in thread_safe_decrement_and_test()
mysql-test/r/bdb.result:
  results updated
mysql-test/r/innodb.result:
  results updated
mysql-test/r/mix_innodb_myisam_binlog.result:
  results updated
mysql-test/r/rpl_relayrotate.result:
  results updated
sql/ha_berkeley.cc:
  style fixes
sql/ha_innodb.cc:
  fixes to follow innodb coding style
sql/handler.cc:
  more comments. XA COMMIT ONE PHASE fix.
sql/handler.h:
  my_xid -> ulonglong. comments
sql/item_func.cc:
  DO RELEASE_LOCK("...") is no cache_stmt
sql/log.cc:
  comments, better error messages
sql/log_event.cc:
  even in autocommit mode we may need to cache_stmt
  xid is ulonglong
sql/log_event.h:
  more comments.
sql/mysql_priv.h:
  query_id is ulonglong
sql/mysqld.cc:
  default value for --log-tc changed
sql/share/errmsg.txt:
  better error messages
sql/sql_class.h:
  cleanup, comments
sql/sql_delete.cc:
  deleting from temporary tables is not always transactional
sql/sql_insert.cc:
  insert into temporary table is not always transactional
sql/sql_load.cc:
  load data into temp table is not always transactional
sql/sql_parse.cc:
  comments. bad merge fixed. xa_state_names[]
sql/sql_table.cc:
  create/drop temp table is not always transactional
sql/sql_update.cc:
  update temp table is not always transactional
parent a7401bf7

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -1914,7 +1914,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
@@ -751,7 +751,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

+1 −1
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ 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;

}

libmysqld/libmysqld.rc

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

libmysqld/resource.h

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file