diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-04-21 21:51:36 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-04-21 21:51:36 +0200 |
| commit | cfac923cf5eb8048f8921ca2dd117d19f0be772f (patch) | |
| tree | afb2c71b5aa19166dd40ee98fa9c7de2ff9ab24c | |
| parent | 8c56ac2f04ae373f191c9e6728b7843d46ffa585 (diff) | |
| parent | 7941c9af51b004762e978019b6e860afc343f3b2 (diff) | |
| download | mariadb-git-cfac923cf5eb8048f8921ca2dd117d19f0be772f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
| -rw-r--r-- | sql/sql_insert.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index bb115b9d548..96d94127316 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -80,7 +80,7 @@ static int check_insert_fields(THD *thd, TABLE *table, List<Item> &fields, check_grant_all_columns(thd,INSERT_ACL,table)) 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 @@ -110,7 +110,7 @@ static int check_insert_fields(THD *thd, TABLE *table, List<Item> &fields, } 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 @@ -167,7 +167,7 @@ static int check_update_fields(THD *thd, TABLE *table, { /* 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; } |