mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
This commit is contained in:
tomas@poseidon.ndb.mysql.com 2004-10-07 16:30:54 +00:00
commit 1dd43fab87
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/ndb_alter_table.result
View file

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

2
mysql-test/t/ndb_alter_table.test
View file

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

3
sql/ha_ndbcluster.cc
View file

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