mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
WL 1682: After review fixes + update bitvector class + bitvector test
cases + bug fixes mysys/my_bitmap.c: Removed debug comments sql/bitvector.h: Changed a number of things Added new methods, new handling of end bits, faster search for bits using word by word search.. sql/field.h: Added comment sql/ha_federated.cc: Fixes sql/ha_innodb.cc: Fixes sql/ha_innodb.h: InnoDB still needs the extra calls not needed by anybody else sql/ha_ndbcluster.cc: Removed some timestamp set bit stuff Always write all fields in write_row sql/handler.cc: No inline methods in bit interface (caused strange bugs) initialise method sql/handler.h: Changed to bitvector from bitmap Removed init variable sql/opt_range.cc: Removed all extra HA_EXTRA_RETRIEVE_* sql/sql_acl.cc: Removed all extra HA_EXTRA_RETRIEVE_* sql/sql_base.cc: Set bits previously missed sql/sql_insert.cc: Removed all extra HA_EXTRA_RETRIEVE_* Timestamp handling sql/sql_load.cc: Updated comments plus set all bits in bitvector sql/sql_select.cc: Removed ifdef since NDB and Federated needs the same calls Added comment or rather changed comment. sql/sql_table.cc: Removed HA_EXTRA_RETRIEVE_* calls Updated comments sql/sql_udf.cc: Removed HA_EXTRA_RETRIEVE_* calls Updated comments sql/sql_update.cc: Removed HA_EXTRA_RETRIEVE_* calls Timstamp updating
This commit is contained in:
@@ -231,7 +231,10 @@ static int check_update_fields(THD *thd, TABLE_LIST *insert_table_list,
|
||||
clear_timestamp_auto_bits(table->timestamp_field_type,
|
||||
TIMESTAMP_AUTO_SET_ON_UPDATE);
|
||||
else
|
||||
{
|
||||
table->timestamp_field->query_id= timestamp_query_id;
|
||||
table->file->ha_set_bit_in_write_set(table->timestamp_field->fieldnr);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -798,10 +801,7 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list, TABLE *table,
|
||||
DBUG_RETURN(TRUE);
|
||||
}
|
||||
if (duplic == DUP_UPDATE || duplic == DUP_REPLACE)
|
||||
{
|
||||
table->file->ha_set_primary_key_in_read_set();
|
||||
table->file->extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY);
|
||||
}
|
||||
table->file->ha_retrieve_all_pk();
|
||||
thd->lex->select_lex.first_execution= 0;
|
||||
DBUG_RETURN(FALSE);
|
||||
}
|
||||
|
Reference in New Issue
Block a user