diff options
author | unknown <jimw@mysql.com> | 2005-07-19 19:59:34 -0700 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-07-19 19:59:34 -0700 |
commit | baad44b9e1e8dbcb2f90bde5983c2683263c7b30 (patch) | |
tree | 3a657be8688ef67ef02e0c687d61bb47bec6fe2f /include | |
parent | 8e845dbad67769bf929e27eb4fcb82e9427c729a (diff) | |
parent | 5958f22a622bdf62b0a426b4184c20f4c962a7e2 (diff) | |
download | mariadb-git-baad44b9e1e8dbcb2f90bde5983c2683263c7b30.tar.gz |
Merge mysql.com:/home/jimw/my/mysql-5.0-5906
into mysql.com:/home/jimw/my/mysql-5.0-clean
libmysql/libmysql.c:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
sql/field.cc:
Auto merged
mysql-test/r/strict.result:
Resolve conflict
mysql-test/t/strict.test:
Resolve conflict
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 8058df8fe4e..aa68a6f0bbd 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -53,7 +53,7 @@ enum enum_mysql_timestamp_type str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time, uint flags, int *was_cut); longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res, - my_bool fuzzy_date, int *was_cut); + uint flags, int *was_cut); ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *time); ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *time); ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *time); |