database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-13 02:22:51 +03:00
Code Activity

Hand merge, which needs fixes.

Browse Source 
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.
This commit is contained in:
unknown
2005-04-20 15:50:29 +02:00
parent b529fed683 acfca4259a
commit ecb51a667e
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
{