summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-02-02 20:13:28 +0200
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-02-02 20:13:28 +0200
commit3b65062d33c7e33ca67e9cc661f572b9c166572a (patch)
tree12d9c3f5bea6c6481050211f64ad22118d925c93 /sql/sql_class.h
parent9b3884e9d75e5cab146a84875b53c93e454b19d5 (diff)
parentac3243c8c82077c34e99e8f7f9a83e5bc9fd7b66 (diff)
downloadmariadb-git-3b65062d33c7e33ca67e9cc661f572b9c166572a.tar.gz
merge
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 8b05497388e..137a0c48ead 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -2280,7 +2280,7 @@ public:
/*TODO: this will be obsolete when we have support for 64 bit my_time_t */
inline bool is_valid_time()
{
- return (start_time < (time_t) MY_TIME_T_MAX);
+ return (IS_TIME_T_VALID_FOR_TIMESTAMP(start_time));
}
void set_time_after_lock() { utime_after_lock= my_micro_time(); }
ulonglong current_utime() { return my_micro_time(); }