Commit e60119f8 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 

into  mysql.com:/space/pekka/ndb/version/my51-bug14509


mysql-test/t/ndb_alter_table.test:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  manual merge
storage/ndb/include/ndbapi/Ndb.hpp:
  manual merge
storage/ndb/src/ndbapi/Ndb.cpp:
  manual merge [needs more fixes]
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  SCCS merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  SCCS merged
parents 44de69cf cda752e3

mysql-test/r/ndb_alter_table.result

+22 −1
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1;

DROP TABLE IF EXISTS t1, t2;

drop database if exists mysqltest;

CREATE TABLE t1 (

a INT NOT NULL,
@@ -328,3 +328,24 @@ select 'no_copy' from ndb_show_tables where id = @t1_id and name like '%t1%'; 
no_copy

no_copy

DROP TABLE t1, ndb_show_tables;

create table t1 (a int primary key auto_increment, b int) engine=ndb;

insert into t1 (b) values (101),(102),(103);

select * from t1 where a = 3;

a	b

3	103

alter table t1 rename t2;

insert into t2 (b) values (201),(202),(203);

select * from t2 where a = 6;

a	b

6	203

alter table t2 add c int;

insert into t2 (b) values (301),(302),(303);

select * from t2 where a = 9;

a	b	c

9	303	NULL

alter table t2 rename t1;

insert into t1 (b) values (401),(402),(403);

select * from t1 where a = 12;

a	b	c

12	403	NULL

drop table t1;

mysql-test/t/ndb_alter_table.test

+16 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
-- source include/not_embedded.inc



--disable_warnings

DROP TABLE IF EXISTS t1;

DROP TABLE IF EXISTS t1, t2;

drop database if exists mysqltest;

--enable_warnings
@@ -325,6 +325,21 @@ on t1 (c010, c011, c012, c013); 


drop table t1;



# simple test that auto incr is not lost at rename or alter

create table t1 (a int primary key auto_increment, b int) engine=ndb;

insert into t1 (b) values (101),(102),(103);

select * from t1 where a = 3;

alter table t1 rename t2;

insert into t2 (b) values (201),(202),(203);

select * from t2 where a = 6;

alter table t2 add c int;

insert into t2 (b) values (301),(302),(303);

select * from t2 where a = 9;

alter table t2 rename t1;

insert into t1 (b) values (401),(402),(403);

select * from t1 where a = 12;

drop table t1;



# End of 4.1 tests



# On-line alter table

storage/ndb/include/ndbapi/Ndb.hpp

+8 −14
Original line number Diff line number Diff line
@@ -986,6 +986,7 @@ class NdbBlob; 
class NdbReceiver;

class TransporterFacade;

class PollGuard;

class Ndb_local_table_info;

template <class T> struct Ndb_free_list_t;



typedef void (* NdbEventCallback)(NdbEventOperation*, Ndb*, void*);
@@ -1482,15 +1483,12 @@ public: 
			     bool increase = false);

  bool setAutoIncrementValue(const NdbDictionary::Table * aTable, 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);

private:

  Uint64 getTupleIdFromNdb(Ndb_local_table_info* info, Uint32 cacheSize);

  Uint64 readTupleIdFromNdb(Ndb_local_table_info* info);

  bool setTupleIdInNdb(Ndb_local_table_info* info, Uint64 val, bool increase);

  Uint64 opTupleIdOnNdb(Ndb_local_table_info* info, Uint64 opValue, Uint32 op);

public:



  /**

   */
@@ -1693,12 +1691,8 @@ private: 
  

  Uint64               the_last_check_time;

  Uint64               theFirstTransId;

  

  // The tupleId is retreived from DB the 

  // tupleId is unique for each tableid. 

  // The tupleId is retrieved from DB

  const NdbDictionary::Table *m_sys_tab_0;

  Uint64               theFirstTupleId[2048]; 

  Uint64               theLastTupleId[2048];           



  Uint32		theRestartGCI;	// the Restart GCI used by DIHNDBTAMPER

storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp

+4 −6
Original line number Diff line number Diff line
@@ -1645,10 +1645,9 @@ void Ndbcntr::systemErrorLab(Signal* signal, int line) 
/*       |-2048| # 1 00000001    |                                           */

/*       |  :  |   :             |                                           */

/*       | -1  | # 1 00000001    |                                           */

/*       |  0  |   0             |                                           */

/*       |  1  |   0             |                                           */

/*       |  :  |   :             |                                           */

/*       | 2047|   0             |                                           */

/*       |  1  |   0             | tupleid sequence now created on first use */

/*       |  :  |   :             |                   v                       */

/*       | 2048|   0             |                   v                       */

/*---------------------------------------------------------------------------*/

void Ndbcntr::createSystableLab(Signal* signal, unsigned index)

{
@@ -1859,8 +1858,7 @@ void Ndbcntr::crSystab8Lab(Signal* signal) 
    jam();

    ckey = 1;

    ctransidPhase = ZFALSE;

    crSystab7Lab(signal);

    return;

    // skip 2nd loop - tupleid sequence now created on first use

  }//if

  signal->theData[0] = ctcConnectionP;

  signal->theData[1] = reference();

storage/ndb/src/ndbapi/DictCache.cpp

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ Ndb_local_table_info::Ndb_local_table_info(NdbTableImpl *table_impl) 
{

  assert(! is_ndb_blob_table(table_impl));

  m_table_impl= table_impl;

  m_first_tuple_id = ~(Uint64)0;

  m_last_tuple_id = ~(Uint64)0;

}



Ndb_local_table_info::~Ndb_local_table_info()