diff options
| author | Monty <monty@mariadb.org> | 2015-02-01 15:24:22 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-02-01 15:24:22 +0200 |
| commit | 0ee879ff8ac1b80cd9a963015344f5698a81f309 (patch) | |
| tree | c787536b279abd6fce40f8f624af2593ddf83403 /sql/sql_class.h | |
| parent | 67b24a2374fed4a7533d14cc443afa0f4e9febc7 (diff) | |
| download | mariadb-git-0ee879ff8ac1b80cd9a963015344f5698a81f309.tar.gz | |
Improve performance for calculating memory allocation
Extend interface for 'show variables' with current scope
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 16913fd50b5..1f80494c974 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -760,7 +760,10 @@ typedef struct system_status_var double last_query_cost; double cpu_time, busy_time; /* Don't initialize */ - volatile int64 memory_used; /* This shouldn't be accumulated */ + /* Memory used for thread local storage */ + volatile int64 local_memory_used; + /* Memory allocated for global usage */ + volatile int64 global_memory_used; } STATUS_VAR; /* @@ -770,7 +773,7 @@ typedef struct system_status_var */ #define last_system_status_var questions -#define last_cleared_system_status_var memory_used +#define last_cleared_system_status_var local_memory_used /* Global status variables |