Commit 4b6fbbc7 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


sql/ha_ndbcluster.cc:
  Auto merged
parents 3fd4bb02 8a8d4163

mysql-test/r/ndb_blob.result

+21 −0
Original line number Diff line number Diff line
@@ -377,3 +377,24 @@ count(*) 
0

drop table t1;

drop database mysqltest;

set autocommit=1;

use test;

CREATE TABLE t1 (

a int,

b text,

PRIMARY KEY  (a)

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

INSERT INTO t1 VALUES 

(1,'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA');

INSERT INTO t1 VALUES 

(2,'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB');

select * from t1 order by a;

a	b

1	AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2	BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB

alter table t1 engine=ndb;

select * from t1 order by a;

a	b

1	AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2	BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB

drop table t1;

mysql-test/r/ndb_limit.result

+41 −0
Original line number Diff line number Diff line
@@ -29,3 +29,44 @@ count(*) 
select * from t2 limit 0;

a	b	c

drop table t2;

CREATE TABLE `t2` (

`views` int(11) NOT NULL default '0',

`clicks` int(11) NOT NULL default '0',

`day` date NOT NULL default '0000-00-00',

`hour` tinyint(4) NOT NULL default '0',

`bannerid` smallint(6) NOT NULL default '0',

`zoneid` smallint(6) NOT NULL default '0',

`source` varchar(50) NOT NULL default '',

PRIMARY KEY  (`day`,`hour`,`bannerid`,`zoneid`,`source`),

KEY `bannerid_day` (`bannerid`,`day`),

KEY `zoneid` (`zoneid`)

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO `t2` VALUES

(  1,0,'2004-09-17', 5,100,100,''),

(  1,0,'2004-09-18', 7,100,100,''),

( 17,0,'2004-09-27',20,132,100,''),

(  4,0,'2004-09-16',23,132,100,''),

( 86,0,'2004-09-18', 7,196,196,''),

( 11,0,'2004-09-16',16,132,100,''),

(140,0,'2004-09-18', 0,100,164,''),

(  2,0,'2004-09-17', 7,132,100,''),

(846,0,'2004-09-27',11,132,164,''),

(  1,0,'2004-09-18', 8,132,100,''),

( 22,0,'2004-09-27', 9,164,132,''),

(711,0,'2004-09-27', 9,100,164,''),

( 11,0,'2004-09-18', 0,196,132,''),

( 41,0,'2004-09-27',15,196,132,''),

( 57,0,'2004-09-18', 2,164,196,'');

SELECT DATE_FORMAT(day, '%Y%m%d') as date, DATE_FORMAT(day, '%d-%m-%Y')

as date_formatted FROM t2 GROUP BY day ORDER BY day DESC;

date	date_formatted

20040927	27-09-2004

20040918	18-09-2004

20040917	17-09-2004

20040916	16-09-2004

SELECT DATE_FORMAT(day, '%Y%m%d') as date, DATE_FORMAT(day, '%d-%m-%Y')

as date_formatted FROM t2 GROUP BY day ORDER BY day DESC LIMIT 2;

date	date_formatted

20040927	27-09-2004

20040918	18-09-2004

drop table t2;

mysql-test/t/ndb_blob.test

+18 −0
Original line number Diff line number Diff line
@@ -308,3 +308,21 @@ rollback; 
select count(*) from t1;

drop table t1;

drop database mysqltest;



set autocommit=1;

use test;

CREATE TABLE t1 (

  a int,

  b text,

  PRIMARY KEY  (a)

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

 

INSERT INTO t1 VALUES 

(1,'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA');

INSERT INTO t1 VALUES 

(2,'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB');



select * from t1 order by a;

alter table t1 engine=ndb;

select * from t1 order by a;

drop table t1;

mysql-test/t/ndb_limit.test

+38 −0
Original line number Diff line number Diff line
@@ -42,3 +42,41 @@ select count(*) from t2 where c=12345678 limit 1000; 
select * from t2 limit 0;



drop table t2;



CREATE TABLE `t2` (

  `views` int(11) NOT NULL default '0',

  `clicks` int(11) NOT NULL default '0',

  `day` date NOT NULL default '0000-00-00',

  `hour` tinyint(4) NOT NULL default '0',

  `bannerid` smallint(6) NOT NULL default '0',

  `zoneid` smallint(6) NOT NULL default '0',

  `source` varchar(50) NOT NULL default '',

  PRIMARY KEY  (`day`,`hour`,`bannerid`,`zoneid`,`source`),

  KEY `bannerid_day` (`bannerid`,`day`),

  KEY `zoneid` (`zoneid`)

) ENGINE=ndbcluster DEFAULT CHARSET=latin1;



INSERT INTO `t2` VALUES

(  1,0,'2004-09-17', 5,100,100,''),

(  1,0,'2004-09-18', 7,100,100,''),

( 17,0,'2004-09-27',20,132,100,''),

(  4,0,'2004-09-16',23,132,100,''),

( 86,0,'2004-09-18', 7,196,196,''),

( 11,0,'2004-09-16',16,132,100,''),

(140,0,'2004-09-18', 0,100,164,''),

(  2,0,'2004-09-17', 7,132,100,''),

(846,0,'2004-09-27',11,132,164,''),

(  1,0,'2004-09-18', 8,132,100,''),

( 22,0,'2004-09-27', 9,164,132,''),

(711,0,'2004-09-27', 9,100,164,''),

( 11,0,'2004-09-18', 0,196,132,''),

( 41,0,'2004-09-27',15,196,132,''),

( 57,0,'2004-09-18', 2,164,196,'');



SELECT DATE_FORMAT(day, '%Y%m%d') as date, DATE_FORMAT(day, '%d-%m-%Y')

as date_formatted FROM t2 GROUP BY day ORDER BY day DESC;



SELECT DATE_FORMAT(day, '%Y%m%d') as date, DATE_FORMAT(day, '%d-%m-%Y')

as date_formatted FROM t2 GROUP BY day ORDER BY day DESC LIMIT 2;



drop table t2;

ndb/src/kernel/blocks/backup/restore/Restore.cpp

+8 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ RestoreMetaData::~RestoreMetaData(){ 
  allTables.clear();

}



const TableS * 

TableS * 

RestoreMetaData::getTable(Uint32 tableId) const {

  for(Uint32 i= 0; i < allTables.size(); i++)

    if(allTables[i]->getTableId() == tableId)
@@ -201,6 +201,8 @@ TableS::TableS(NdbTableImpl* tableImpl) 
{

  m_dictTable = tableImpl;

  m_noOfNullable = m_nullBitmaskSize = 0;

  m_auto_val_id= ~(Uint32)0;

  m_max_auto_val= 0;



  for (int i = 0; i < tableImpl->getNoOfColumns(); i++)

    createAttr(tableImpl->getColumn(i));
@@ -269,7 +271,7 @@ int TupleS::getNoOfAttributes() const { 
  return m_currentTable->getNoOfAttributes();

};



const TableS * TupleS::getTable() const {

TableS * TupleS::getTable() const {

  return m_currentTable;

};
@@ -282,7 +284,7 @@ AttributeData * TupleS::getData(int i) const{ 
};



bool

TupleS::prepareRecord(const TableS & tab){

TupleS::prepareRecord(TableS & tab){

  if (allAttrData) {

    if (getNoOfAttributes() == tab.getNoOfAttributes())

    {
@@ -698,6 +700,9 @@ void TableS::createAttr(NdbDictionary::Column *column) 
  d->attrId = allAttributesDesc.size();

  allAttributesDesc.push_back(d);



  if (d->m_column->getAutoIncrement())

    m_auto_val_id= d->attrId;



  if(d->m_column->getPrimaryKey() /* && not variable */)

  {

    m_fixedKeys.push_back(d);