Commit 264cf5c5 authored by unknown's avatar unknown

C99 Portability fix

parent 4f1f0b67
...@@ -103,7 +103,7 @@ static int check_insert_fields(THD *thd, TABLE_LIST *table_list, ...@@ -103,7 +103,7 @@ static int check_insert_fields(THD *thd, TABLE_LIST *table_list,
return -1; return -1;
} }
#endif #endif
(int) table->timestamp_field_type&= ~ (int) TIMESTAMP_AUTO_SET_ON_INSERT; *(int*)&table->timestamp_field_type&= ~ (int) TIMESTAMP_AUTO_SET_ON_INSERT;
} }
else else
{ // Part field list { // Part field list
...@@ -150,7 +150,7 @@ static int check_insert_fields(THD *thd, TABLE_LIST *table_list, ...@@ -150,7 +150,7 @@ static int check_insert_fields(THD *thd, TABLE_LIST *table_list,
} }
if (table->timestamp_field && // Don't set timestamp if used if (table->timestamp_field && // Don't set timestamp if used
table->timestamp_field->query_id == thd->query_id) 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 // For the values we need select_priv
#ifndef NO_EMBEDDED_ACCESS_CHECKS #ifndef NO_EMBEDDED_ACCESS_CHECKS
...@@ -216,7 +216,7 @@ static int check_update_fields(THD *thd, TABLE_LIST *insert_table_list, ...@@ -216,7 +216,7 @@ static int check_update_fields(THD *thd, TABLE_LIST *insert_table_list,
{ {
/* Don't set timestamp column if this is modified. */ /* Don't set timestamp column if this is modified. */
if (table->timestamp_field->query_id == thd->query_id) 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 else
table->timestamp_field->query_id= timestamp_query_id; table->timestamp_field->query_id= timestamp_query_id;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment