diff options
author | unknown <serg@serg.mylan> | 2005-01-27 22:38:56 +0100 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2005-01-27 22:38:56 +0100 |
commit | 042448aa3364a65ed41ceeff10edbd170ee85a2c (patch) | |
tree | 6715c798eca742afb2f6f41acc10e122a8d50aa0 /include | |
parent | a7401bf7cc1646f76710992cd77c54b97df8d860 (diff) | |
download | mariadb-git-042448aa3364a65ed41ceeff10edbd170ee85a2c.tar.gz |
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
Diffstat (limited to 'include')
-rw-r--r-- | include/my_global.h | 2 | ||||
-rw-r--r-- | include/my_pthread.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index e8f93ee5d7a..9eb22c3561c 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -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) diff --git a/include/my_pthread.h b/include/my_pthread.h index f108bc02801..10556b49c41 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -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; } |