Commit ebb2e53a authored by unknown's avatar unknown
Browse files

Merge eel.(none):/home/jonas/src/mysql-4.1 

into  eel.(none):/home/jonas/src/mysql-5.0


mysql-test/r/ndb_alter_table.result:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/kernel/SimBlockList.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/DictCache.cpp:
  Auto merged
ndb/src/ndbapi/DictCache.hpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  merge
ndb/src/common/util/version.c:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
parents 4fc1f429 c7744c6d

mysql-test/r/ndb_alter_table.result

+17 −1
Original line number Diff line number Diff line
@@ -179,8 +179,24 @@ a b c 
2	two	two

alter table t1 drop index c;

select * from t1 where b = 'two';

ERROR HY000: Table definition has changed, please retry transaction

a	b	c

2	two	two

select * from t1 where b = 'two';

a	b	c

2	two	two

drop table t1;

create table t3 (a int primary key) engine=ndbcluster;

begin;

insert into t3 values (1);

alter table t3 rename t4;

delete from t3;

insert into t3 values (1);

commit;

select * from t3;

ERROR HY000: Can't lock file (errno: 155)

select * from t4;

a

1

drop table t4;

show tables;

Tables_in_test

mysql-test/t/ndb_alter_table.test

+25 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ select * from t1 where b = 'two'; 
connection server1;

alter table t1 drop index c;

connection server2;

--error 1412

select * from t1 where b = 'two';

select * from t1 where b = 'two';

connection server1;
@@ -179,3 +178,28 @@ drop table t1; 
#truncate table t2;

#select count(*) from t2;

#drop table t2;



connection server1;

create table t3 (a int primary key) engine=ndbcluster;



connection server2;

begin;

insert into t3 values (1);



connection server1;

alter table t3 rename t4;



connection server2;

# This should work as transaction is ongoing...

delete from t3;

insert into t3 values (1);

commit; 



# This should fail as its a new transaction

--error 1015

select * from t3;

select * from t4;

drop table t4;

show tables;

connection server1;

mysql-test/t/ndb_config.test

+1 −0
Original line number Diff line number Diff line 
-- source include/have_ndb.inc

-- source include/ndb_default_cluster.inc

-- source include/not_embedded.inc



--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=type,nodeid,host 2> /dev/null

ndb/include/kernel/BlockNumbers.h

+1 −3
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ 
#define TRIX        0xFF

#define DBUTIL     0x100

#define SUMA       0x101

#define GREP       0x102

#define DBTUX      0x103

#define DBTUX      0x102



const BlockReference BACKUP_REF  = numberToRef(BACKUP, 0);

const BlockReference DBTC_REF    = numberToRef(DBTC, 0);
@@ -61,7 +60,6 @@ const BlockReference CMVMI_REF = numberToRef(CMVMI, 0); 
const BlockReference TRIX_REF    = numberToRef(TRIX, 0);

const BlockReference DBUTIL_REF  = numberToRef(DBUTIL, 0);

const BlockReference SUMA_REF    = numberToRef(SUMA, 0);

const BlockReference GREP_REF    = numberToRef(GREP, 0);

const BlockReference DBTUX_REF   = numberToRef(DBTUX, 0);



const BlockNumber MIN_BLOCK_NO = BACKUP;

ndb/include/kernel/GlobalSignalNumbers.h

+2 −2
Original line number Diff line number Diff line
@@ -777,8 +777,8 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
/**

 * Grep signals

 */

#define GSN_GREP_SUB_CREATE_REQ         606

#define GSN_GREP_SUB_CREATE_REF         607

#define GSN_ALTER_TABLE_REP             606

#define GSN_API_BROADCAST_REP           607

#define GSN_GREP_SUB_CREATE_CONF        608

#define GSN_GREP_CREATE_REQ             609

#define GSN_GREP_CREATE_REF             610