database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Hand merge, which needs fixes.

Browse Source
This commit is contained in:
ingo@mysql.com
2005-04-20 15:50:29 +02:00
parent 4156f9fa44 c179d0c1cc
commit 692093c041
35 changed files with 210 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/table.h
View File

@@ -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
{