Commit 5d44ecd4 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


sql/ha_ndbcluster.cc:
  Auto merged
parents 747855f9 bc32bf0b

mysql-test/t/ndb_blob_partition.test

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

-- source include/not_embedded.inc



--disable_query_log

set new=on;

--enable_query_log



--disable_warnings

drop table if exists t1;

--enable_warnings

mysql-test/t/ndb_dd_backuprestore.test

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ 


-- source include/have_ndb.inc



--disable_query_log

set new=on;

--enable_query_log



--disable_warnings

DROP TABLE IF EXISTS test.t1;

DROP TABLE IF EXISTS test.t2;

mysql-test/t/ndb_partition_error.test

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ 
drop table if exists t1;

--enable_warnings



--disable_query_log

set new=on;

--enable_query_log

#

# Partition by range, generate node group error

#

mysql-test/t/ndb_partition_list.test

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ 
# 

#-- source include/have_partition.inc



--disable_query_log

set new=on;

--enable_query_log



--disable_warnings

drop table if exists t1;

--enable_warnings

mysql-test/t/ndb_partition_range.test

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ 
# 

#-- source include/have_partition.inc



--disable_query_log

set new=on;

--enable_query_log



--disable_warnings

drop table if exists t1;

--enable_warnings