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

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

mysql-test/t/ndb_alter_table.test

 -- 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

 -- 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

 -- 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

 -- 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

 --source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 drop table if exists t1;

mysql-test/t/ndb_cache.test

 -- source include/have_query_cache.inc
 -- source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 drop table if exists t1;

mysql-test/t/ndb_charset.test

 --source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 drop table if exists t1;

mysql-test/t/ndb_index.test

 -- source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 drop table if exists t1;

mysql-test/t/ndb_index_ordered.test

 -- source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 drop table if exists t1, test1, test2;

mysql-test/t/ndb_index_unique.test

 -- source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 drop table if exists t1, t2, t3, t4, t5, t6, t7, t8;

mysql-test/t/ndb_insert.test

 -- source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;

mysql-test/t/ndb_limit.test

 -- source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t2;

mysql-test/t/ndb_lock.test

 -- source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 connect (con1,localhost,root,,);
 connect (con2,localhost,root,,);

mysql-test/t/ndb_minmax.test

 -- source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 drop table if exists t1, t2;

mysql-test/t/ndb_multi.test

 -- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
+-- source include/not_embedded.inc
 
 
 --disable_warnings

mysql-test/t/ndb_replace.test

 -- source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 #
 # Test of REPLACE with NDB

mysql-test/t/ndb_restore.test

 -- source include/have_ndb.inc
 -- source include/ndb_default_cluster.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 use test;

mysql-test/t/ndb_subquery.test

 -- source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 drop table if exists t1;

mysql-test/t/ndb_transaction.test

 -- 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_truncate.test

 -- source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t2;

mysql-test/t/ndb_types.test

 -- source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;

mysql-test/t/ndb_update.test

 -- source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;
@@ -14,11 +15,20 @@ DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (
   pk1 INT NOT NULL PRIMARY KEY,
   b INT NOT NULL,
-  c INT NOT NULL
+  c INT NOT NULL UNIQUE
 ) ENGINE=ndbcluster;
 
-INSERT INTO t1 VALUES (0, 0, 1),(1,1,2),(2,2,3);
+INSERT INTO t1 VALUES (0, 1, 0),(1,2,1),(2,3,2);
 UPDATE t1 set b = c;
 select * from t1 order by pk1;
+UPDATE t1 set pk1 = 4 where pk1 = 1;
+select * from t1 order by pk1;
+-- error 1062
+UPDATE t1 set pk1 = 1, c = 2 where pk1 = 4;
+select * from t1 order by pk1;
+UPDATE t1 set pk1 = pk1 + 10;
+select * from t1 order by pk1;
 
-drop table t1;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp

@@ -1879,7 +1879,6 @@ void Dbtc::execKEYINFO(Signal* signal)
   do {
     if (cfirstfreeDatabuf == RNIL) {
       jam();
-      abort();
       seizeDatabuferrorLab(signal);
       return;
     }//if

sql/ha_ndbcluster.cc

@@ -1957,8 +1957,10 @@ int ha_ndbcluster::write_row(byte *record)
       m_skip_auto_increment= !auto_increment_column_changed;
     }
 
-    if ((res= set_primary_key(op)))
-      return res;
+    if ((res= (m_primary_key_update ?
+               set_primary_key_from_old_data(op, record)
+               : set_primary_key(op))))
+      return res;  
   }
 
   // Set non-key attribute(s)
@@ -2098,7 +2100,7 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data)
   {
     int read_res, insert_res, delete_res;
 
-    DBUG_PRINT("info", ("primary key update, doing pk read+insert+delete"));
+    DBUG_PRINT("info", ("primary key update, doing pk read+delete+insert"));
     // Get all old fields, since we optimize away fields not in query
     read_res= complemented_pk_read(old_data, new_data);
     if (read_res)
@@ -2106,15 +2108,7 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data)
       DBUG_PRINT("info", ("pk read failed"));
       DBUG_RETURN(read_res);
     }
-    // Insert new row
-    insert_res= write_row(new_data);
-    if (insert_res)
-    {
-      DBUG_PRINT("info", ("insert failed"));
-      DBUG_RETURN(insert_res);
-    }
     // Delete old row
-    DBUG_PRINT("info", ("insert succeded"));
     m_primary_key_update= TRUE;
     delete_res= delete_row(old_data);
     m_primary_key_update= FALSE;
@@ -2122,9 +2116,23 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data)
     {
       DBUG_PRINT("info", ("delete failed"));
       // Undo write_row(new_data)
-      DBUG_RETURN(delete_row(new_data));
+      DBUG_RETURN(delete_res);
     }     
-    DBUG_PRINT("info", ("insert+delete succeeded"));
+    // Insert new row
+    DBUG_PRINT("info", ("delete succeded"));
+    insert_res= write_row(new_data);
+    if (insert_res)
+    {
+      DBUG_PRINT("info", ("insert failed"));
+      if (trans->commitStatus() == NdbConnection::Started)
+      {
+        m_primary_key_update= TRUE;
+        insert_res= write_row((byte *)old_data);
+        m_primary_key_update= FALSE;
+      }
+      DBUG_RETURN(insert_res);
+    }
+    DBUG_PRINT("info", ("delete+insert succeeded"));
     DBUG_RETURN(0);
   }
 
@@ -2226,8 +2234,9 @@ int ha_ndbcluster::delete_row(const byte *record)
 
     no_uncommitted_rows_update(-1);
 
-    // If deleting from cursor, NoCommit will be handled in next_result
-    DBUG_RETURN(0);
+    if (!m_primary_key_update)
+      // If deleting from cursor, NoCommit will be handled in next_result
+      DBUG_RETURN(0);
   }
   else
   {