Commit f26353f3 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


libmysql/libmysql.c:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents e01280f4 c1e09728

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;

mysql-test/t/ndb_blob.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;