Commit 1266ccc8 authored by unknown's avatar unknown
Browse files

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0


ndb/src/ndbapi/SignalSender.cpp:
  Merge
parents 1d003c52 a49e23ad

mysql-test/r/connect.result

+6 −0
Original line number Diff line number Diff line 
drop table if exists t1,t2;

show tables;

Tables_in_mysql

columns_priv
@@ -71,3 +72,8 @@ show tables; 
Tables_in_test

delete from mysql.user where user=_binary"test";

flush privileges;

create table t1 (id integer not null auto_increment primary key);

create temporary table t2(id integer not null auto_increment primary key);

set @id := 1;

delete from t1 where id like @id;

drop table t1;

mysql-test/t/connect.test

+18 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ 
# This test makes no sense with the embedded server

--source include/not_embedded.inc



--disable_warnings

drop table if exists t1,t2;

--enable_warnings



#connect (con1,localhost,root,,"");

#show tables;

connect (con1,localhost,root,,mysql);
@@ -77,4 +81,18 @@ show tables; 
delete from mysql.user where user=_binary"test";

flush privileges;



#

# Bug#12517: Clear user variables and replication events before 

#            closing temp tables in thread cleanup.

connect (con2,localhost,root,,test);

connection con2;

create table t1 (id integer not null auto_increment primary key);

create temporary table t2(id integer not null auto_increment primary key);

set @id := 1;

delete from t1 where id like @id;

disconnect con2;

--sleep 5

connection default;

drop table t1;



# End of 4.1 tests

ndb/src/ndbapi/SignalSender.cpp

+0 −1
Original line number Diff line number Diff line
@@ -267,4 +267,3 @@ SignalSender::execNodeStatus(void* signalSender, 
template SimpleSignal* SignalSender::waitFor<WaitForNode>(unsigned, WaitForNode&);

template SimpleSignal* SignalSender::waitFor<WaitForAny>(unsigned, WaitForAny&);

template class Vector<SimpleSignal*>;

sql/sql_class.cc

+2 −2
Original line number Diff line number Diff line
@@ -377,12 +377,12 @@ void THD::cleanup(void) 
  mysql_ha_flush(this, (TABLE_LIST*) 0,

                 MYSQL_HA_CLOSE_FINAL | MYSQL_HA_FLUSH_ALL);

  hash_free(&handler_tables_hash);

  delete_dynamic(&user_var_events);

  hash_free(&user_vars);

  close_temporary_tables(this);

  my_free((char*) variables.time_format, MYF(MY_ALLOW_ZERO_PTR));

  my_free((char*) variables.date_format, MYF(MY_ALLOW_ZERO_PTR));

  my_free((char*) variables.datetime_format, MYF(MY_ALLOW_ZERO_PTR));

  delete_dynamic(&user_var_events);

  hash_free(&user_vars);

  sp_cache_clear(&sp_proc_cache);

  sp_cache_clear(&sp_func_cache);

  if (global_read_lock)