Commit aef2cdd2 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-work 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  SCCS merged
parents 0ec6bb3f a0630577

mysql-test/r/ndb_dd_ddl.result

+18 −0
Original line number Diff line number Diff line
@@ -188,6 +188,19 @@ ENGINE NDB; 
CREATE INDEX b_i on t1(b);

CREATE INDEX bc_i on t1(b, c);

DROP TABLE t1;

CREATE TABLESPACE ts2

ADD DATAFILE 'datafile3.dat'

USE LOGFILE GROUP lg1

INITIAL_SIZE 1M

ENGINE NDB;

ALTER TABLESPACE ts1

DROP DATAFILE 'datafile3.dat'

ENGINE NDB;

ERROR HY000: Failed to alter:  NO SUCH FILE

ALTER TABLESPACE ts2

DROP DATAFILE 'datafile2.dat'

ENGINE NDB;

ERROR HY000: Failed to alter:  NO SUCH FILE

ALTER TABLESPACE ts1

DROP DATAFILE 'datafile2.dat'

ENGINE NDB;
@@ -196,6 +209,11 @@ DROP DATAFILE 'datafile.dat' 
ENGINE NDB;

DROP TABLESPACE ts1

ENGINE NDB;

ALTER TABLESPACE ts2

DROP DATAFILE 'datafile3.dat'

ENGINE NDB;

DROP TABLESPACE ts2

ENGINE NDB;

DROP LOGFILE GROUP lg1

ENGINE NDB;

**** End = And No =  ****

mysql-test/t/ndb_dd_ddl.test

+26 −0
Original line number Diff line number Diff line
@@ -280,6 +280,25 @@ CREATE INDEX bc_i on t1(b, c); 


DROP TABLE t1;



# bug#20053



CREATE TABLESPACE ts2

ADD DATAFILE 'datafile3.dat'

USE LOGFILE GROUP lg1

INITIAL_SIZE 1M

ENGINE NDB;



--error ER_ALTER_FILEGROUP_FAILED

ALTER TABLESPACE ts1

DROP DATAFILE 'datafile3.dat'

ENGINE NDB;



--error ER_ALTER_FILEGROUP_FAILED

ALTER TABLESPACE ts2

DROP DATAFILE 'datafile2.dat'

ENGINE NDB;

# bug#20053



ALTER TABLESPACE ts1

DROP DATAFILE 'datafile2.dat'

ENGINE NDB;
@@ -291,6 +310,13 @@ ENGINE NDB; 
DROP TABLESPACE ts1

ENGINE NDB;



ALTER TABLESPACE ts2

DROP DATAFILE 'datafile3.dat'

ENGINE NDB;



DROP TABLESPACE ts2

ENGINE NDB;



DROP LOGFILE GROUP lg1

ENGINE NDB;

sql/ha_ndbcluster.cc

+10 −5
Original line number Diff line number Diff line
@@ -10070,9 +10070,12 @@ int ndbcluster_alter_tablespace(THD* thd, st_alter_tablespace *info) 
    }

    else if(info->ts_alter_tablespace_type == ALTER_TABLESPACE_DROP_FILE)

    {

      NdbDictionary::Datafile df = dict->getDatafile(0, 

						     info->data_file_name);

      if (strcmp(df.getPath(), info->data_file_name) == 0)

      NdbDictionary::Tablespace ts= dict->getTablespace(info->tablespace_name);

      NdbDictionary::Datafile df= dict->getDatafile(0, info->data_file_name);

      NdbDictionary::ObjectId objid;

      df.getTablespaceId(&objid);

      if (ts.getObjectId() == objid.getObjectId() && 

	  strcmp(df.getPath(), info->data_file_name) == 0)

      {

	errmsg= " DROP DATAFILE";

	if (dict->dropDatafile(df))
@@ -10401,10 +10404,12 @@ static int ndbcluster_fill_files_table(THD *thd, TABLE_LIST *tables, 
      table->field[c++]->set_null(); // TABLE_NAME



      // LOGFILE_GROUP_NAME

      NdbDictionary::ObjectId objid;

      uf.getLogfileGroupId(&objid);

      table->field[c++]->store(uf.getLogfileGroup(),

                               strlen(uf.getLogfileGroup()),

                               system_charset_info);

      table->field[c++]->store(uf.getLogfileGroupId()); // LOGFILE_GROUP_NUMBER

      table->field[c++]->store(objid.getObjectId()); // LOGFILE_GROUP_NUMBER

      table->field[c++]->store(ndbcluster_hton_name,

                               ndbcluster_hton_name_length,

                               system_charset_info); // ENGINE

storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp

+2 −1
Original line number Diff line number Diff line
@@ -159,7 +159,8 @@ struct CreateFileRef { 
    InvalidFilegroupVersion = 754,

    FilenameAlreadyExists = 760,

    OutOfFileRecords = 751,

    InvalidFileType = 750

    InvalidFileType = 750,

    NotSupportedWhenDiskless = 775

  };

  

  Uint32 senderData;

storage/ndb/include/kernel/signaldata/SystemError.hpp

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ public: 
    CopyFragRefError = 5,

    TestStopOnError = 6,

    CopySubscriptionRef = 7,

    CopySubscriberRef = 8

    CopySubscriberRef = 8,

    StartFragRefError = 9

  };

  

  Uint32 errorRef;