Merge bk@192.168.21.1:mysql-5.1-new

into mysql.com:/home/hf/work/mysql-5.1.clean

mysql-test/t/binlog_row_blackhole.test

@@ -2,4 +2,10 @@
 # For both statement and row based bin logs 9/19/2005 [jbm]
 
 -- source include/have_binlog_format_row.inc
+
+# Bug#18326: Do not lock table for writing during prepare of statement
+# The use of the ps protocol causes extra table maps in the binlog, so
+# we disable the ps-protocol for this statement.
+--disable_ps_protocol
 -- source extra/binlog_tests/blackhole.test
+--enable_ps_protocol

mysql-test/t/binlog_row_insert_select.test

@@ -2,4 +2,9 @@
 # For both statement and row based bin logs 9/19/2005 [jbm]
 
 -- source include/have_binlog_format_row.inc
+# Bug#18326: Do not lock table for writing during prepare of statement
+# The use of the ps protocol causes extra table maps in the binlog, so
+# we disable the ps-protocol for this statement.
+--disable_ps_protocol
 -- source extra/binlog_tests/insert_select-binlog.test
+--enable_ps_protocol

mysql-test/t/binlog_row_mix_innodb_myisam.test

@@ -2,8 +2,16 @@
 # For both statement and row based bin logs 9/19/2005 [jbm]
 
 -- source include/have_binlog_format_row.inc
+
+# Bug#18326: Do not lock table for writing during prepare of statement
+# The use of the ps protocol causes extra table maps in the binlog, so
+# we disable the ps-protocol for this statement.
+--disable_ps_protocol
+
 -- source extra/binlog_tests/mix_innodb_myisam_binlog.test
 
+--enable_ps_protocol
+
 # This piece below cannot be put into
 # extra/binlog_tests/mix_innodb_myisam_binlog.test
 # because the argument of --start-position differs between statement-

mysql-test/t/rpl_row_create_table.test

@@ -3,6 +3,11 @@
 --source include/have_binlog_format_row.inc
 --source include/master-slave.inc
 
+# Bug#18326: Do not lock table for writing during prepare of statement
+# The use of the ps protocol causes extra table maps in the binlog, so
+# we disable the ps-protocol for this statement.
+--disable_ps_protocol
+
 --disable_query_log
 --disable_warnings
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9;
@@ -111,3 +116,4 @@ STOP SLAVE;
 SET GLOBAL storage_engine=@storage_engine;
 START SLAVE;
 --enable_query_log
+--enable_ps_protocol

mysql-test/t/rpl_row_flsh_tbls.test

@@ -2,5 +2,11 @@
 -- source include/have_binlog_format_row.inc
 
 let $rename_event_pos= 615;
+
+# Bug#18326: Do not lock table for writing during prepare of statement
+# The use of the ps protocol causes extra table maps in the binlog, so
+# we disable the ps-protocol for this statement.
+--disable_ps_protocol
 -- source extra/rpl_tests/rpl_flsh_tbls.test
+--enable_ps_protocol
 

sql/ha_ndbcluster.h

@@ -761,7 +761,7 @@ private:
   int set_ndb_value(NdbOperation*, Field *field, uint fieldnr,
 		    int row_offset= 0, bool *set_blob_value= 0);
   int get_ndb_value(NdbOperation*, Field *field, uint fieldnr, byte*);
-  int ha_ndbcluster::get_ndb_partition_id(NdbOperation *);
+  int get_ndb_partition_id(NdbOperation *);
   friend int g_get_ndb_blobs_value(NdbBlob *ndb_blob, void *arg);
   int get_ndb_blobs_value(NdbBlob *last_ndb_blob);
   int set_primary_key(NdbOperation *op, const byte *key);

storage/ndb/src/kernel/blocks/pgman.hpp

@@ -494,6 +494,9 @@ private:
   friend class NdbOut& operator<<(NdbOut&, Ptr<Page_entry>);
 };
 
+class NdbOut& operator<<(NdbOut&, Ptr<Pgman::Page_request>);
+class NdbOut& operator<<(NdbOut&, Ptr<Pgman::Page_entry>);
+
 class Page_cache_client
 {
   Uint32 m_block;