summaryrefslogtreecommitdiff
path: root/sql/structs.h
diff options
context:
space:
mode:
authorgluh@gluh.mysql.r18.ru <>2003-10-20 13:24:18 +0500
committergluh@gluh.mysql.r18.ru <>2003-10-20 13:24:18 +0500
commit62b0b8b800be5316d73f1642e6cc3f0cf562e171 (patch)
treea0500a3926dc01176082cc42ad87fbaed18113b3 /sql/structs.h
parentf434b329f58a0ae60b40d0fe41a8cab68162cbaa (diff)
downloadmariadb-git-62b0b8b800be5316d73f1642e6cc3f0cf562e171.tar.gz
Scrum task 835 - text-to-datetime conversion function
Diffstat (limited to 'sql/structs.h')
-rw-r--r--sql/structs.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/structs.h b/sql/structs.h
index 05ebdba7a37..d9be230c049 100644
--- a/sql/structs.h
+++ b/sql/structs.h
@@ -24,6 +24,11 @@ typedef struct st_date_format { /* How to print date */
uint pos[6]; /* Positions to YY.MM.DD HH:MM:SS */
} DATE_FORMAT;
+typedef struct st_datetime_format {
+ byte dt_pos[8];
+ char *format;
+ uint format_length;
+} DATETIME_FORMAT;
typedef struct st_keyfile_info { /* used with ha_info() */
byte ref[MAX_REFLENGTH]; /* Pointer to current row */
@@ -110,8 +115,8 @@ typedef struct st_read_record { /* Parameter to read_record */
bool print_error, ignore_not_found_rows;
} READ_RECORD;
-enum timestamp_type { TIMESTAMP_NONE, TIMESTAMP_DATE, TIMESTAMP_FULL,
- TIMESTAMP_TIME };
+enum timestamp_type { TIMESTAMP_NONE, WRONG_TIMESTAMP_FULL, TIMESTAMP_DATE, TIMESTAMP_FULL,
+ TIMESTAMP_TIME};
typedef struct st_time {
uint year,month,day,hour,minute,second;