diff options
| author | unknown <ingo@mysql.com> | 2005-04-19 15:12:32 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-04-19 15:12:32 +0200 |
| commit | 3be2d4897ed0ada8287e311b200dca3ee363f9b9 (patch) | |
| tree | 9cb95fc093977b8c0dc0f72436619e902f464eea /sql/mysql_priv.h | |
| parent | 92a00143d7460c964523494e573508c151b9cba4 (diff) | |
| download | mariadb-git-3be2d4897ed0ada8287e311b200dca3ee363f9b9.tar.gz | |
Bug#7806 - insert on duplicate key and auto-update of timestamp
Modified the check for the timestamp field so that the flags for
the automatic for inserts and updates are cleared independently.
mysql-test/r/type_timestamp.result:
Bug#7806 - insert on duplicate key and auto-update of timestamp
The test result.
mysql-test/t/type_timestamp.test:
Bug#7806 - insert on duplicate key and auto-update of timestamp
The test case.
sql/mysql_priv.h:
Bug#7806 - insert on duplicate key and auto-update of timestamp
Made check_insert_fields() static. It is used only in sql_insert.cc.
sql/sql_insert.cc:
Bug#7806 - insert on duplicate key and auto-update of timestamp
Modified the check of the insert fields so that an explicit
assignment of the timestamp field does only disable the automatic
for inserts and retains the automatic for updates.
Added a check if the update fields contain the timestamp field.
In this case, the automatic on update is disabled, but not the
automatic on insert. This is called from mysql_prepare_insert().
sql/table.h:
Bug#7806 - insert on duplicate key and auto-update of timestamp
Extended a comment to warn about usage of enum timestamp_auto_set_type.
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 2b13b2053d7..e75a6f25957 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -668,8 +668,6 @@ void mysql_sql_stmt_execute(THD *thd, LEX_STRING *stmt_name); void mysql_stmt_free(THD *thd, char *packet); void mysql_stmt_reset(THD *thd, char *packet); void mysql_stmt_get_longdata(THD *thd, char *pos, ulong packet_length); -int check_insert_fields(THD *thd,TABLE *table,List<Item> &fields, - List<Item> &values, ulong counter); /* sql_error.cc */ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, uint code, |