diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-06-10 12:09:21 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-06-10 12:09:21 +0300 |
| commit | 3516b4b5d14b07a94f752f063cc04c7dd70cc155 (patch) | |
| tree | a3e5f851ecc68dccb3a9bd99f2d29af43e0156a2 /sql/sql_class.cc | |
| parent | 9e3570ea6c0872bcb8a9e0c7de4216945d8d3523 (diff) | |
| parent | 13f55aac67343450d1c2872dd238d81093d09f11 (diff) | |
| download | mariadb-git-3516b4b5d14b07a94f752f063cc04c7dd70cc155.tar.gz | |
Merge with 5.2
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index cf52b4008f3..23890a0e506 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1195,11 +1195,11 @@ void add_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var) *(to++)+= *(from++); /* Handle the not ulong variables. See end of system_status_var */ - to_var->bytes_received= from_var->bytes_received; + to_var->bytes_received+= from_var->bytes_received; to_var->bytes_sent+= from_var->bytes_sent; to_var->rows_read+= from_var->rows_read; to_var->rows_sent+= from_var->rows_sent; - to_var->binlog_bytes_written= from_var->binlog_bytes_written; + to_var->binlog_bytes_written+= from_var->binlog_bytes_written; to_var->cpu_time+= from_var->cpu_time; to_var->busy_time+= from_var->busy_time; } |