Commit 7a414bf4 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-4.1-ndb
parents 1d399d1d caa525d8

mysql-test/r/ndb_alter_table.result

+12 −0
Original line number Diff line number Diff line
@@ -16,8 +16,14 @@ col3 varchar (20) not null, 
col4 varchar(4) not null,

col5 enum('PENDING', 'ACTIVE', 'DISABLED') not null,

col6 int not null, to_be_deleted int)  ENGINE=ndbcluster;

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	ndbcluster	9	Dynamic	100	0	0	NULL	0	0	0	NULL	NULL	NULL	latin1_swedish_ci	NULL		

insert into t1 values

(0,4,3,5,"PENDING",1,7),(NULL,4,3,5,"PENDING",1,7),(31,4,3,5,"PENDING",1,7), (7,4,3,5,"PENDING",1,7), (NULL,4,3,5,"PENDING",1,7), (100,4,3,5,"PENDING",1,7), (99,4,3,5,"PENDING",1,7), (8,4,3,5,"PENDING",1,7), (NULL,4,3,5,"PENDING",1,7);

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	ndbcluster	9	Dynamic	100	0	0	NULL	0	0	102	NULL	NULL	NULL	latin1_swedish_ci	NULL		

select * from t1 order by col1;

col1	col2	col3	col4	col5	col6	to_be_deleted

0	4	3	5	PENDING	1	7
@@ -35,6 +41,9 @@ add column col7 varchar(30) not null after col5, 
add column col8 datetime not null, drop column to_be_deleted,

change column col2 fourth varchar(30) not null after col3,

modify column col6 int not null first;

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	ndbcluster	9	Dynamic	100	0	0	NULL	0	0	102	NULL	NULL	NULL	latin1_swedish_ci	NULL		

select * from t1 order by col1;

col6	col1	col3	fourth	col4	col4_5	col5	col7	col8

1	0	3	4	5		PENDING		0000-00-00 00:00:00
@@ -47,6 +56,9 @@ col6 col1 col3 fourth col4 col4_5 col5 col7 col8 
1	100	3	4	5		PENDING		0000-00-00 00:00:00

1	101	3	4	5		PENDING		0000-00-00 00:00:00

insert into t1 values (2, NULL,4,3,5,99,"PENDING","EXTRA",'2004-01-01 00:00:00');

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	ndbcluster	9	Dynamic	100	0	0	NULL	0	0	103	NULL	NULL	NULL	latin1_swedish_ci	NULL		

select * from t1 order by col1;

col6	col1	col3	fourth	col4	col4_5	col5	col7	col8

1	0	3	4	5		PENDING		0000-00-00 00:00:00

mysql-test/t/ndb_alter_table.test

+4 −0
Original line number Diff line number Diff line
@@ -30,8 +30,10 @@ col3 varchar (20) not null, 
col4 varchar(4) not null,

col5 enum('PENDING', 'ACTIVE', 'DISABLED') not null,

col6 int not null, to_be_deleted int)  ENGINE=ndbcluster;

show table status;

insert into t1 values

(0,4,3,5,"PENDING",1,7),(NULL,4,3,5,"PENDING",1,7),(31,4,3,5,"PENDING",1,7), (7,4,3,5,"PENDING",1,7), (NULL,4,3,5,"PENDING",1,7), (100,4,3,5,"PENDING",1,7), (99,4,3,5,"PENDING",1,7), (8,4,3,5,"PENDING",1,7), (NULL,4,3,5,"PENDING",1,7);

show table status;

select * from t1 order by col1;

alter table t1

add column col4_5 varchar(20) not null after col4,
@@ -39,8 +41,10 @@ add column col7 varchar(30) not null after col5, 
add column col8 datetime not null, drop column to_be_deleted,

change column col2 fourth varchar(30) not null after col3,

modify column col6 int not null first;

show table status;

select * from t1 order by col1;

insert into t1 values (2, NULL,4,3,5,99,"PENDING","EXTRA",'2004-01-01 00:00:00');

show table status;

select * from t1 order by col1;

drop table t1;

ndb/include/ndbapi/Ndb.hpp

+13 −6
Original line number Diff line number Diff line
@@ -1414,12 +1414,19 @@ public: 
   *

   * @return tuple id or 0 on error

   */

  Uint64 getAutoIncrementValue(const char* aTableName, Uint32 cacheSize = 1);

  bool setAutoIncrementValue(const char* aTableName, Uint64 val, bool increase = false);

  Uint64 getTupleIdFromNdb(const char* aTableName, Uint32 cacheSize = 1000 );

  Uint64 getTupleIdFromNdb(Uint32 aTableId, Uint32 cacheSize = 1000 );

  bool setTupleIdInNdb(const char* aTableName, Uint64 val, bool increase = false);

  bool setTupleIdInNdb(Uint32 aTableId, Uint64 val, bool increase = false);

  Uint64 getAutoIncrementValue(const char* aTableName, 

			       Uint32 cacheSize = 1);

  Uint64 readAutoIncrementValue(const char* aTableName);

  bool setAutoIncrementValue(const char* aTableName, Uint64 val, 

			     bool increase = false);

  Uint64 getTupleIdFromNdb(const char* aTableName, 

			   Uint32 cacheSize = 1000);

  Uint64 getTupleIdFromNdb(Uint32 aTableId, 

			   Uint32 cacheSize = 1000);

  Uint64 readTupleIdFromNdb(Uint32 aTableId);

  bool setTupleIdInNdb(const char* aTableName, Uint64 val, 

		       bool increase);

  bool setTupleIdInNdb(Uint32 aTableId, Uint64 val, bool increase);

  Uint64 opTupleIdOnNdb(Uint32 aTableId, Uint64 opValue, Uint32 op);

#endif

ndb/src/ndbapi/Ndb.cpp

+33 −3
Original line number Diff line number Diff line
@@ -714,9 +714,10 @@ Ndb::getNodeId() 
}



/****************************************************************************

Uint64 getTupleIdFromNdb( Uint32 aTableId );

Uint64 getTupleIdFromNdb( Uint32 aTableId, Uint32 cacheSize );



Parameters:     aTableId : The TableId.

                cacheSize: Prefetch this many values

Remark:		Returns a new TupleId to the application.

                The TupleId comes from SYSTAB_0 where SYSKEY_0 = TableId.

                It is initialized to (TableId << 48) + 1 in NdbcntrMain.cpp.
@@ -758,6 +759,27 @@ Ndb::getTupleIdFromNdb(Uint32 aTableId, Uint32 cacheSize ) 
  }

}



Uint64

Ndb::readAutoIncrementValue(const char* aTableName)

{

  DEBUG_TRACE("readtAutoIncrementValue");

  const NdbTableImpl* table = theDictionary->getTable(aTableName);

  if (table == 0)

    return ~0;

  Uint64 tupleId = readTupleIdFromNdb(table->m_tableId);

  return tupleId;

}



Uint64

Ndb::readTupleIdFromNdb(Uint32 aTableId)

{

  if ( theFirstTupleId[aTableId] == theLastTupleId[aTableId] )

    // Cache is empty, check next in database

    return opTupleIdOnNdb(aTableId, 0, 3);



  return theFirstTupleId[aTableId] + 1;

}



bool

Ndb::setAutoIncrementValue(const char* aTableName, Uint64 val, bool increase)

{
@@ -891,6 +913,14 @@ Ndb::opTupleIdOnNdb(Uint32 aTableId, Uint64 opValue, Uint32 op) 
	ret = opValue;

      }

      break;

    case 3:

      tOperation->readTuple();

      tOperation->equal("SYSKEY_0", aTableId );

      tRecAttrResult = tOperation->getValue("NEXTID");

      if (tConnection->execute( Commit ) == -1 )

        goto error_handler;

      ret = tRecAttrResult->u_64_value();

      break;

    default:

      goto error_handler;

    }

sql/ha_ndbcluster.cc

+9 −5
Original line number Diff line number Diff line
@@ -1281,7 +1281,7 @@ int ha_ndbcluster::define_read_attrs(byte* buf, NdbOperation* op) 


int ha_ndbcluster::write_row(byte *record)

{

  bool has_auto_increment, auto_increment_field_not_null;

  bool has_auto_increment;

  uint i;

  NdbConnection *trans= m_active_trans;

  NdbOperation *op;
@@ -1292,8 +1292,8 @@ int ha_ndbcluster::write_row(byte *record) 
  if (table->timestamp_default_now)

    update_timestamp(record+table->timestamp_default_now-1);

  has_auto_increment= (table->next_number_field && record == table->record[0]);

  auto_increment_field_not_null= table->auto_increment_field_not_null;

  if ((has_auto_increment) && (!auto_increment_field_not_null))

  skip_auto_increment= table->auto_increment_field_not_null;

  if ((has_auto_increment) && (!skip_auto_increment))

    update_auto_increment();



  if (!(op= trans->getNdbOperation(m_tabname)))
@@ -1347,7 +1347,7 @@ int ha_ndbcluster::write_row(byte *record) 
    if (trans->execute(NoCommit) != 0)

      DBUG_RETURN(ndb_err(trans));

  }

  if ((has_auto_increment) && (auto_increment_field_not_null))

  if ((has_auto_increment) && (skip_auto_increment))

  {

    Uint64 next_val= (Uint64) table->next_number_field->val_int() + 1;

    DBUG_PRINT("info",
@@ -1356,6 +1356,7 @@ int ha_ndbcluster::write_row(byte *record) 
      DBUG_PRINT("info", 

		 ("Setting next auto increment value to %u", next_val));  

  }

  skip_auto_increment= true;



  DBUG_RETURN(0);

}
@@ -3049,7 +3050,9 @@ longlong ha_ndbcluster::get_auto_increment() 
    rows_to_insert 

    : autoincrement_prefetch;

  Uint64 auto_value= 

    m_ndb->getAutoIncrementValue(m_tabname, cache_size);

    (skip_auto_increment) ? 

    m_ndb->readAutoIncrementValue(m_tabname)

    : m_ndb->getAutoIncrementValue(m_tabname, cache_size);

  DBUG_RETURN((longlong)auto_value);

}
@@ -3074,6 +3077,7 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg): 
  bulk_insert_rows(1024),

  bulk_insert_not_flushed(false),

  ops_pending(0),

  skip_auto_increment(true),

  blobs_buffer(0),

  blobs_buffer_size(0)

{