Commit 4c77c3dd authored by unknown's avatar unknown
Browse files

bug#16767, bug#16768 - ndb missleading names of error codes 

  rename error codes


mysql-test/t/ndb_dd_ddl.test:
  rename error code
sql/ha_ndbcluster.cc:
  rename error code
sql/share/errmsg.txt:
  rename error code
parent 1c9178c1

mysql-test/t/ndb_dd_ddl.test

+8 −8
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ INITIAL_SIZE 16M 
UNDO_BUFFER_SIZE = 1M

ENGINE=NDB;



--error ER_CREATE_TABLESPACE_FAILED

--error ER_CREATE_FILEGROUP_FAILED

CREATE LOGFILE GROUP lg1

ADD UNDOFILE 'undofile.dat'

INITIAL_SIZE 16M
@@ -52,7 +52,7 @@ ALTER LOGFILE GROUP lg1 
ADD UNDOFILE 'undofile02.dat'

INITIAL_SIZE 4M ENGINE NDB;



--error ER_ALTER_TABLESPACE_FAILED

--error ER_ALTER_FILEGROUP_FAILED

ALTER LOGFILE GROUP lg1

ADD UNDOFILE 'undofile02.dat'

INITIAL_SIZE 4M ENGINE=NDB;
@@ -63,7 +63,7 @@ USE LOGFILE GROUP lg1 
INITIAL_SIZE 12M

ENGINE NDB;



--error ER_CREATE_TABLESPACE_FAILED

--error ER_CREATE_FILEGROUP_FAILED

CREATE TABLESPACE ts1

ADD DATAFILE 'datafile.dat'

USE LOGFILE GROUP lg1
@@ -76,7 +76,7 @@ ADD DATAFILE 'datafile2.dat' 
INITIAL_SIZE 12M

ENGINE=NDB;



--error ER_ALTER_TABLESPACE_FAILED

--error ER_ALTER_FILEGROUP_FAILED

ALTER TABLESPACE ts1

ADD DATAFILE 'datafile2.dat'

INITIAL_SIZE 12M
@@ -105,7 +105,7 @@ ALTER TABLESPACE ts1 
DROP DATAFILE 'datafile2.dat' 

ENGINE=NDB;



--error ER_ALTER_TABLESPACE_FAILED

--error ER_ALTER_FILEGROUP_FAILED

ALTER TABLESPACE ts1

DROP DATAFILE 'datafile2.dat' 

ENGINE=NDB;
@@ -114,7 +114,7 @@ ALTER TABLESPACE ts1 
DROP DATAFILE 'datafile.dat' 

ENGINE=NDB;



--error ER_ALTER_TABLESPACE_FAILED

--error ER_ALTER_FILEGROUP_FAILED

ALTER TABLESPACE ts1

DROP DATAFILE 'datafile.dat' 

ENGINE=NDB;
@@ -122,14 +122,14 @@ ENGINE=NDB; 
DROP TABLESPACE ts1 

ENGINE=NDB;



--error ER_DROP_TABLESPACE_FAILED

--error ER_DROP_FILEGROUP_FAILED

DROP TABLESPACE ts1 

ENGINE=NDB;



DROP LOGFILE GROUP lg1 

ENGINE=NDB;



--error ER_DROP_TABLESPACE_FAILED

--error ER_DROP_FILEGROUP_FAILED

DROP LOGFILE GROUP lg1 

ENGINE=NDB;

sql/ha_ndbcluster.cc

+7 −7
Original line number Diff line number Diff line
@@ -9378,7 +9378,7 @@ int ndbcluster_alter_tablespace(THD* thd, st_alter_tablespace *info) 
  switch (info->ts_cmd_type){

  case (CREATE_TABLESPACE):

  {

    error= ER_CREATE_TABLESPACE_FAILED;

    error= ER_CREATE_FILEGROUP_FAILED;

    

    NdbDictionary::Tablespace ndb_ts;

    NdbDictionary::Datafile ndb_df;
@@ -9408,7 +9408,7 @@ int ndbcluster_alter_tablespace(THD* thd, st_alter_tablespace *info) 
  }

  case (ALTER_TABLESPACE):

  {

    error= ER_ALTER_TABLESPACE_FAILED;

    error= ER_ALTER_FILEGROUP_FAILED;

    if (info->ts_alter_tablespace_type == ALTER_TABLESPACE_ADD_FILE)

    {

      NdbDictionary::Datafile ndb_df;
@@ -9437,7 +9437,7 @@ int ndbcluster_alter_tablespace(THD* thd, st_alter_tablespace *info) 
      else

      {

	DBUG_PRINT("error", ("No such datafile"));

	my_error(ER_ALTER_TABLESPACE_FAILED, MYF(0), " NO SUCH FILE");

	my_error(ER_ALTER_FILEGROUP_FAILED, MYF(0), " NO SUCH FILE");

	DBUG_RETURN(1);

      }

    }
@@ -9452,7 +9452,7 @@ int ndbcluster_alter_tablespace(THD* thd, st_alter_tablespace *info) 
  }

  case (CREATE_LOGFILE_GROUP):

  {

    error= ER_CREATE_TABLESPACE_FAILED;

    error= ER_CREATE_FILEGROUP_FAILED;

    NdbDictionary::LogfileGroup ndb_lg;

    NdbDictionary::Undofile ndb_uf;

    if (info->undo_file_name == NULL)
@@ -9485,7 +9485,7 @@ int ndbcluster_alter_tablespace(THD* thd, st_alter_tablespace *info) 
  }

  case (ALTER_LOGFILE_GROUP):

  {

    error= ER_ALTER_TABLESPACE_FAILED;

    error= ER_ALTER_FILEGROUP_FAILED;

    if (info->undo_file_name == NULL)

    {

      /*
@@ -9507,7 +9507,7 @@ int ndbcluster_alter_tablespace(THD* thd, st_alter_tablespace *info) 
  }

  case (DROP_TABLESPACE):

  {

    error= ER_DROP_TABLESPACE_FAILED;

    error= ER_DROP_FILEGROUP_FAILED;

    errmsg= "TABLESPACE";

    if (dict->dropTablespace(dict->getTablespace(info->tablespace_name)))

    {
@@ -9518,7 +9518,7 @@ int ndbcluster_alter_tablespace(THD* thd, st_alter_tablespace *info) 
  }

  case (DROP_LOGFILE_GROUP):

  {

    error= ER_DROP_TABLESPACE_FAILED;

    error= ER_DROP_FILEGROUP_FAILED;

    errmsg= "LOGFILE GROUP";

    if (dict->dropLogfileGroup(dict->getLogfileGroup(info->logfile_group_name)))

    {

sql/share/errmsg.txt

+4 −4
Original line number Diff line number Diff line
@@ -5739,11 +5739,11 @@ ER_WRONG_VALUE 
	eng "Incorrect %-.32s value: '%-.128s'"

ER_NO_PARTITION_FOR_GIVEN_VALUE

	eng "Table has no partition for value %-.64s"

ER_TABLESPACE_OPTION_ONLY_ONCE

ER_FILEGROUP_OPTION_ONLY_ONCE

        eng "It is not allowed to specify %s more than once"

ER_CREATE_TABLESPACE_FAILED

ER_CREATE_FILEGROUP_FAILED

        eng "Failed to create %s"

ER_DROP_TABLESPACE_FAILED

ER_DROP_FILEGROUP_FAILED

        eng "Failed to drop %s"

ER_TABLESPACE_AUTO_EXTEND_ERROR

        eng "The handler doesn't support autoextend of tablespaces"
@@ -5751,7 +5751,7 @@ ER_WRONG_SIZE_NUMBER 
        eng "A size parameter was incorrectly specified, either number or on the form 10M"

ER_SIZE_OVERFLOW_ERROR

        eng "The size number was correct but we don't allow the digit part to be more than 2 billion"

ER_ALTER_TABLESPACE_FAILED

ER_ALTER_FILEGROUP_FAILED

        eng "Failed to alter: %s"

ER_BINLOG_ROW_LOGGING_FAILED

	eng "Writing one row to the row-based binary log failed"