Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

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


mysql-test/t/ndb_alter_table.test:
  Auto merged

mysql-test/t/ndb_alter_table.test

@@ -142,6 +142,7 @@ INSERT INTO t1 VALUES (1,2,0),(18,19,4),(20,21,0);
 select c from t1 order by c;
 drop table t1;
 
+--disable_ps_protocol
 create table t1 ( a int primary key, b varchar(10), c varchar(10), index (b) )
 engine=ndb;
 insert into t1 values (1,'one','one'), (2,'two','two'), (3,'three','three');
@@ -157,6 +158,7 @@ select * from t1 where b = 'two';
 select * from t1 where b = 'two';
 connection server1;
 drop table t1;
+--enable_ps_protocol
 
 #--disable_warnings
 #DROP TABLE IF EXISTS t2;