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

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

3 files changed, 7 insertions, 0 deletions

diff --git a/mysql-test/r/ndb_alter_table.result b/mysql-test/r/ndb_alter_table.result
index 28a50504064..ee7c3b28fe2 100644
--- a/mysql-test/r/ndb_alter_table.result
+++ b/mysql-test/r/ndb_alter_table.result
@@ -116,7 +116,9 @@ select * from t1 order by a;
 a	b
 0	1
 17	18
+SET SQL_MODE=NO_AUTO_VALUE_ON_ZERO;
 alter table  t1 modify column a int not null auto_increment;
+SET SQL_MODE='';
 select * from t1 order by a;
 a	b
 0	1
diff --git a/mysql-test/t/ndb_alter_table.test b/mysql-test/t/ndb_alter_table.test
index 1c1ef670af2..22b1a0e476d 100644
--- a/mysql-test/t/ndb_alter_table.test
+++ b/mysql-test/t/ndb_alter_table.test
@@ -95,7 +95,9 @@ CREATE TABLE t1 (
 
 INSERT INTO t1 VALUES (0,1),(17,18);
 select * from t1 order by a;
+SET SQL_MODE=NO_AUTO_VALUE_ON_ZERO;
 alter table  t1 modify column a int not null auto_increment;
+SET SQL_MODE='';
 select * from t1 order by a;
 INSERT INTO t1 VALUES (0,19),(20,21);
 select * from t1 order by a;
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 8faa0b33756..bb6ace75f1f 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -2170,6 +2170,9 @@ int ha_ndbcluster::index_read(byte *buf,
     break;
   }
   
+  if (m_active_cursor)
+    close_scan();
+    
   key_range start_key;
   start_key.key = key;
   start_key.length = key_len;