Commit c1e09728 authored by unknown's avatar unknown
Browse files

Merge 


mysql-test/t/ndb_alter_table.test:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_cache.test:
  Auto merged
mysql-test/t/ndb_charset.test:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
mysql-test/t/ndb_types.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents f7934410 7f0f4c58

libmysql/libmysql.c

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ void STDCALL mysql_server_end() 
  else

    mysql_thread_end();

  finish_client_errs();

  free_charsets();

  mysql_client_init= org_my_init_done= 0;

}

mysql-test/t/ndb_alter_table.test

+1 −0
Original line number Diff line number Diff line 
-- source include/have_ndb.inc

-- source include/have_multi_ndb.inc

-- source include/not_embedded.inc



--disable_warnings

DROP TABLE IF EXISTS t1;

mysql-test/t/ndb_autodiscover.test

+1 −0
Original line number Diff line number Diff line 
-- source include/have_ndb.inc

-- source include/not_embedded.inc



--disable_warnings

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;

mysql-test/t/ndb_autodiscover2.test

+1 −0
Original line number Diff line number Diff line 
-- source include/have_ndb.inc

-- source include/not_embedded.inc



#

# Simple test to show use of discover when the server has been restarted

mysql-test/t/ndb_basic.test

+1 −0
Original line number Diff line number Diff line 
-- source include/have_ndb.inc

-- source include/not_embedded.inc



--disable_warnings

DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;