diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-15 14:16:49 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-15 14:16:49 +0300 |
| commit | a8ef1bafb10be68dac7111d7a71b2483c2dbd78d (patch) | |
| tree | 2c79edc43ff38be4c2de71e4fee4285523f5c08c /sql/sql_profile.h | |
| parent | d5a498abc668763053d46c83e61827f78a4bad0d (diff) | |
| parent | cd437325bbfac833a14ece01a9772f49ad6c6fee (diff) | |
| download | mariadb-git-a8ef1bafb10be68dac7111d7a71b2483c2dbd78d.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/log_event.cc
- sql/sql_class.h
Diffstat (limited to 'sql/sql_profile.h')
| -rw-r--r-- | sql/sql_profile.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_profile.h b/sql/sql_profile.h index e9c5686efab..33597ca337e 100644 --- a/sql/sql_profile.h +++ b/sql/sql_profile.h @@ -165,6 +165,8 @@ private: char *status; #ifdef HAVE_GETRUSAGE struct rusage rusage; +#elif defined(_WIN32) + FILETIME ftKernel, ftUser; #endif char *function; |