database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Manual merge from mysql-next-mr.

Browse Source 
Conflicts:
  - sql/log_event.cc
  - sql/sql_class.h
This commit is contained in:
Alexander Nozdrin
2010-02-15 14:16:49 +03:00
parent d5a498abc6 cd437325bb
commit a8ef1bafb1
212 changed files with 6025 additions and 2402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_profile.h
View File

@ -165,6 +165,8 @@ private:
char *status;
#ifdef HAVE_GETRUSAGE
struct rusage rusage;
#elif defined(_WIN32)
FILETIME ftKernel, ftUser;
#endif
char *function;