summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorVasil Dimov <vasil.dimov@oracle.com>2010-06-17 12:41:20 +0300
committerVasil Dimov <vasil.dimov@oracle.com>2010-06-17 12:41:20 +0300
commitb31987c1419fc6a3cae4313d0b60dcb828ad5f62 (patch)
tree320ea6022db45038b1777190c1ba014fd7ba8247 /sql/sql_class.h
parent028bb395b747a505d3c94f8c4c33f3d7ef0e17a8 (diff)
parentaf632d82d9fae2ddcd0e4c8aed5d67246165169e (diff)
downloadmariadb-git-b31987c1419fc6a3cae4313d0b60dcb828ad5f62.tar.gz
Merge mysql-trunk-bugfixing -> mysql-trunk-innodb
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index f1fce5ef472..25b136bc4ca 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -2355,6 +2355,11 @@ public:
start_time= user_time= t;
start_utime= utime_after_lock= my_micro_time();
}
+ /*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);
+ }
void set_time_after_lock() { utime_after_lock= my_micro_time(); }
ulonglong current_utime() { return my_micro_time(); }
inline ulonglong found_rows(void)