diff options
| author | unknown <ingo@mysql.com> | 2005-04-20 15:50:29 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-04-20 15:50:29 +0200 |
| commit | ecb51a667efbf31c9f18f9a47be24987ffe6d49e (patch) | |
| tree | 3cc7666a56033c0793f4f0a7be82e9d1be168acb /sql/table.h | |
| parent | b529fed6833047a8e729773419b369111a4c1f4c (diff) | |
| parent | acfca4259aae5418f8024763c003fcfc27e1e9b6 (diff) | |
| download | mariadb-git-ecb51a667efbf31c9f18f9a47be24987ffe6d49e.tar.gz | |
Hand merge, which needs fixes.
mysql-test/r/type_timestamp.result:
Auto merged
mysql-test/t/type_timestamp.test:
Auto merged
sql/table.h:
Auto merged
ndb/test/ndbapi/Makefile.am:
Using local 5.0 version.
sql/mysql_priv.h:
Merged.
sql/sql_insert.cc:
Merge needs fixes.
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h index 270ec313240..d00ac41140e 100644 --- a/sql/table.h +++ b/sql/table.h @@ -73,6 +73,10 @@ typedef struct st_filesort_info /* Values in this enum are used to indicate during which operations value of TIMESTAMP field should be set to current timestamp. + WARNING: The values are used for bit operations. If you change the enum, + you must keep the bitwise relation of the values. For example: + (int) TIMESTAMP_AUTO_SET_ON_BOTH == + (int) TIMESTAMP_AUTO_SET_ON_INSERT | (int) TIMESTAMP_AUTO_SET_ON_UPDATE. */ enum timestamp_auto_set_type { |