database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-03 05:41:09 +03:00
Code Activity

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

Browse Source 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/mysqld.cc:
  Manual merge
storage/myisam/sort.c:
  Manual merge
This commit is contained in:
unknown
2006-10-30 13:45:24 +01:00
parent be22efdaef e948c64ff5
commit 2e35e44899
7 changed files with 163 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_class.cc
View File

@@ -513,14 +513,13 @@ THD::~THD()
void add_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var)
{
ulong *end= (ulong*) ((byte*) to_var + offsetof(STATUS_VAR,
last_system_status_var) +
ulong *end= (ulong*) ((byte*) to_var +
offsetof(STATUS_VAR, last_system_status_var) +
sizeof(ulong));
ulong *to= (ulong*) to_var, *from= (ulong*) from_var;
while (to != end)
*(to++)+= *(from++);
/* it doesn't make sense to add last_query_cost values */
}
/*