diff options
| author | unknown <andrey@lmy004.> | 2006-06-20 17:14:36 +0200 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-06-20 17:14:36 +0200 |
| commit | d898972dc034176e4a6f4334bf3a6c1a6827f9c3 (patch) | |
| tree | fd0c09b50a9465f331eb5366fb20cc7888a4a8eb /include | |
| parent | 40a614ed5a45674c6dd5d259a7a977cc72b4b113 (diff) | |
| parent | 7daf362e2436cc3a300c47d33fcb43e00774f3a8 (diff) | |
| download | mariadb-git-d898972dc034176e4a6f4334bf3a6c1a6827f9c3.tar.gz | |
manual merge
BitKeeper/etc/ignore:
auto-union
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/events.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/time.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_time.h b/include/my_time.h index df500dc501b..3025b98a9c4 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -104,7 +104,7 @@ enum interval_type INTERVAL_YEAR_MONTH, INTERVAL_DAY_HOUR, INTERVAL_DAY_MINUTE, INTERVAL_DAY_SECOND, INTERVAL_HOUR_MINUTE, INTERVAL_HOUR_SECOND, INTERVAL_MINUTE_SECOND, INTERVAL_DAY_MICROSECOND, INTERVAL_HOUR_MICROSECOND, - INTERVAL_MINUTE_MICROSECOND, INTERVAL_SECOND_MICROSECOND + INTERVAL_MINUTE_MICROSECOND, INTERVAL_SECOND_MICROSECOND, INTERVAL_LAST }; C_MODE_END |