diff options
| author | unknown <serg@serg.mylan> | 2003-10-15 12:25:44 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-15 12:25:44 +0200 |
| commit | ca671e9d816a51b8600b07e470b973ee9a150eb6 (patch) | |
| tree | 39df3a873ccd4aba6541c6659c5508843742f8be /sql/item_timefunc.cc | |
| parent | d72c4a535c21382d90a6fcc19335cc4224b953e3 (diff) | |
| parent | b16e6f76f9f801e067a013bb15fd1ef3886f604f (diff) | |
| download | mariadb-git-ca671e9d816a51b8600b07e470b973ee9a150eb6.tar.gz | |
merged
BitKeeper/etc/ignore:
auto-union
myisam/myisamdef.h:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 31ce2ad9cdc..9a36f8a60a6 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -57,13 +57,13 @@ static String day_names[] = String("Sunday", &my_charset_latin1) }; -enum date_time_format_types -{ +enum date_time_format_types +{ TIME_ONLY= 0, TIME_MICROSECOND, DATE_ONLY, DATE_TIME, DATE_TIME_MICROSECOND }; -typedef struct date_time_format +struct date_time_format { const char* format_str; uint length; |