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

1 files changed, 30 insertions, 18 deletions

diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index b8aa2df0fa9..60127a0b67c 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -698,7 +698,7 @@ ha_innobase::update_thd(
 {
 	row_prebuilt_t*	prebuilt = (row_prebuilt_t*) innobase_prebuilt;
 	trx_t*		trx;
-	
+
 	trx = check_trx_exists(thd);
 
 	if (prebuilt->trx != trx) {
@@ -711,11 +711,23 @@ ha_innobase::update_thd(
 	return(0);
 }
 
-static void register_trans(THD *thd)
+/*************************************************************************
+Registers the InnoDB transaction in MySQL, to receive commit/rollback
+events. This function must be called every time InnoDB starts a
+transaction internally. */
+static
+void
+register_trans(
+/*============*/
+	THD*	thd)	/* in: thd to use the handle */
 {
-  trans_register_ha(thd, FALSE, &innobase_hton);
-  if (thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))
-    trans_register_ha(thd, TRUE, &innobase_hton);
+        /* register the start of the statement */
+        trans_register_ha(thd, FALSE, &innobase_hton);
+        if (thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) {
+
+              /* no autocommit mode, register for a transaction */
+              trans_register_ha(thd, TRUE, &innobase_hton);
+        }
 }
 
 /*   BACKGROUND INFO: HOW THE MYSQL QUERY CACHE WORKS WITH INNODB
@@ -1459,12 +1471,12 @@ innobase_report_binlog_offset_and_commit(
 
 	ut_a(trx != NULL);
 
-	trx->mysql_log_file_name = log_file_name;  	
+	trx->mysql_log_file_name = log_file_name;
 	trx->mysql_log_offset = (ib_longlong)end_offset;
-	
+
 	trx->flush_log_later = TRUE;
 
-  	innobase_commit(thd, trx_handle);
+	innobase_commit(thd, trx_handle);
 
 	trx->flush_log_later = FALSE;
 
@@ -1474,18 +1486,18 @@ innobase_report_binlog_offset_and_commit(
 /***********************************************************************
 This function stores the binlog offset and flushes logs. */
 
-void 
+void
 innobase_store_binlog_offset_and_flush_log(
 /*=======================================*/
     char *binlog_name,          /* in: binlog name */
-    longlong 	offset)		/* in: binlog offset */
+    longlong	offset)		/* in: binlog offset */
 {
 	mtr_t mtr;
-	
+
 	assert(binlog_name != NULL);
 
 	/* Start a mini-transaction */
-        mtr_start_noninline(&mtr); 
+        mtr_start_noninline(&mtr);
 
 	/* Update the latest MySQL binlog name and offset info
         in trx sys header */
@@ -1497,7 +1509,7 @@ innobase_store_binlog_offset_and_flush_log(
 
         /* Commits the mini-transaction */
         mtr_commit(&mtr);
-        
+
 	/* Syncronous flush of the log buffer to disk */
 	log_buffer_flush_to_disk();
 }
@@ -1520,14 +1532,14 @@ innobase_commit_complete(
 
         if (trx && trx->active_trans) {
 
-          trx->active_trans = 0;
+                trx->active_trans = 0;
 
-	if (srv_flush_log_at_trx_commit == 0) {
+                if (srv_flush_log_at_trx_commit == 0) {
 
-	        return(0);
-	}
+                        return(0);
+                }
 
-  	trx_commit_complete_for_mysql(trx);
+                trx_commit_complete_for_mysql(trx);
         }
 
 	return(0);