mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
C99 Portability fix
This commit is contained in:
@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user