Commit 2e35e448 authored by unknown's avatar unknown
Browse files

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

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
parents be22efda e948c64f

mysql-test/include/mix1.inc

+7 −2
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ DROP TABLE t1, t2; 
#

# Bug #22728 - Handler_rollback value is growing

#

flush status;



let $before= `show /*!50002 GLOBAL */ status like 'Handler_rollback'`;

create table t1 (c1 int) engine=innodb;

connect (con1,localhost,root,,);

connect (con2,localhost,root,,);
@@ -158,7 +159,11 @@ handler t1 open; 
handler t1 read first;

disconnect con2;

connection con1;

show /*!50002 GLOBAL */ status like 'Handler_rollback';

let $after= `show /*!50002 GLOBAL */ status like 'Handler_rollback'`;

# Compare the before and after value, it should be equal

--disable_query_log

eval select STRCMP("$before", "$after") as "Before and after comparison";

--enable_query_log

connection default;

drop table t1;

disconnect con1;

mysql-test/r/innodb_mysql.result

+2 −4
Original line number Diff line number Diff line
@@ -105,14 +105,12 @@ SELECT `id1` FROM `t1` WHERE `id1` NOT IN (SELECT `id1` FROM `t2` WHERE `id2` = 
id1

2

DROP TABLE t1, t2;

flush status;

create table t1 (c1 int) engine=innodb;

handler t1 open;

handler t1 read first;

c1

show /*!50002 GLOBAL */ status like 'Handler_rollback';

Variable_name	Value

Handler_rollback	0

Before and after comparison

0

drop table t1;

End of 4.1 tests

create table t1m (a int) engine = MEMORY;

sql/mysqld.cc

+9 −1
Original line number Diff line number Diff line
@@ -6581,6 +6581,10 @@ static int show_ssl_get_cipher_list(THD *thd, SHOW_VAR *var, char *buff) 
#endif /* HAVE_OPENSSL */





/*

  Variables shown by SHOW STATUS in alphabetical order

*/



SHOW_VAR status_vars[]= {

  {"Aborted_clients",          (char*) &aborted_threads,        SHOW_LONG},

  {"Aborted_connects",         (char*) &aborted_connects,       SHOW_LONG},
@@ -8088,16 +8092,20 @@ void refresh_status(THD *thd) 
{

  pthread_mutex_lock(&LOCK_status);



  /* We must update the global status before cleaning up the thread */

  /* Add thread's status variabes to global status */

  add_to_status(&global_status_var, &thd->status_var);



  /* Reset thread's status variables */

  bzero((char*) &thd->status_var, sizeof(thd->status_var));



  /* Reset some global variables */

  for (SHOW_VAR *ptr= status_vars; ptr->name; ptr++)

  {

    /* Note that SHOW_LONG_NOFLUSH variables are not reset */

    if (ptr->type == SHOW_LONG)

      *(ulong*) ptr->value= 0;

  }



  /* Reset the counters of all key caches (default and named). */

  process_key_caches(reset_key_cache_counters);

  pthread_mutex_unlock(&LOCK_status);

sql/set_var.cc

+1 −1
Original line number Diff line number Diff line
@@ -743,7 +743,7 @@ static int show_slave_skip_errors(THD *thd, SHOW_VAR *var, char *buff) 
#endif /* HAVE_REPLICATION */



/*

  Variables shown by SHOW variables in alphabetical order

  Variables shown by SHOW VARIABLES in alphabetical order

*/



SHOW_VAR init_vars[]= {

sql/sql_class.cc

+2 −3
Original line number Diff line number Diff line
@@ -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 */

}



/*