Commit 264b163e authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents ff879b93 1b991b1a

mysql-test/r/ndb_alter_table.result

+2 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/ndb_alter_table.test

+2 −0
Original line number Diff line number Diff line
@@ -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;

sql/ha_ndbcluster.cc

+3 −0
Original line number Diff line number Diff line
@@ -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;