bk commit into 5.0 tree (acurtis:1.1873)

[antony]

Below is the list of changes that have just been committed into a local
5.0 repository of acurtis. When acurtis does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1873 05/04/21 18:38:34 acurtis@stripped +1 -0
  C99 Portability fix

  sql/sql_insert.cc
    1.142 05/04/21 18:38:09 acurtis@stripped +3 -3
    C99 Portability fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	acurtis
# Host:	ltantony.xiphis.org
# Root:	/.amd_mnt/bk.anubis/host/work-acurtis/bug9102

--- 1.141/sql/sql_insert.cc	2005-04-21 09:28:09 +01:00
+++ 1.142/sql/sql_insert.cc	2005-04-21 18:38:09 +01:00
@@ -103,7 +103,7 @@
         return -1;
     }
 #endif
-    (int) table->timestamp_field_type&= ~ (int) TIMESTAMP_AUTO_SET_ON_INSERT;
+    *(int*)&table->timestamp_field_type&= ~ (int)
TIMESTAMP_AUTO_SET_ON_INSERT;
   }
   else
   {						// Part field list
@@ -150,7 +150,7 @@
     }
     if (table->timestamp_field &&	// Don't set timestamp if used
 	table->timestamp_field->query_id == thd->query_id)
-      (int) table->timestamp_field_type&= ~ (int) TIMESTAMP_AUTO_SET_ON_INSERT;
+      *(int*)&table->timestamp_field_type&= ~ (int)
TIMESTAMP_AUTO_SET_ON_INSERT;
   }
   // For the values we need select_priv
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
@@ -216,7 +216,7 @@
   {
     /* Don't set timestamp column if this is modified. */
     if (table->timestamp_field->query_id == thd->query_id)
-      (int) table->timestamp_field_type&= ~ (int) TIMESTAMP_AUTO_SET_ON_UPDATE;
+      *(int*)&table->timestamp_field_type&= ~ (int)
TIMESTAMP_AUTO_SET_ON_UPDATE;
     else
       table->timestamp_field->query_id= timestamp_query_id;
   }