database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge trunk-bugfixing -> trunk-runtime

Browse Source
This commit is contained in:
Konstantin Osipov
2010-06-17 17:31:51 +04:00
parent 91a7b14705 45c7bf3c54
commit cc6dabba37
388 changed files with 6327 additions and 11537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_class.h
View File

@ -2212,6 +2212,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)