bk commit into 5.1 tree (jonas:1.2070) BUG#16768

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2070 06/02/06 13:27:16 jonas@stripped +3 -0
  bug#16767, bug#16768 - ndb missleading names of error codes
    rename error codes

  sql/share/errmsg.txt
    1.79 06/02/06 13:27:13 jonas@stripped +4 -4
    rename error code

  sql/ha_ndbcluster.cc
    1.258 06/02/06 13:27:13 jonas@stripped +7 -7
    rename error code

  mysql-test/t/ndb_dd_ddl.test
    1.5 06/02/06 13:27:13 jonas@stripped +8 -8
    rename error code

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-new

--- 1.78/sql/share/errmsg.txt	2006-02-02 09:59:20 +01:00
+++ 1.79/sql/share/errmsg.txt	2006-02-06 13:27:13 +01:00
@@ -5739,11 +5739,11 @@
 	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 @@
         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"

--- 1.4/mysql-test/t/ndb_dd_ddl.test	2006-01-31 20:10:19 +01:00
+++ 1.5/mysql-test/t/ndb_dd_ddl.test	2006-02-06 13:27:13 +01:00
@@ -41,7 +41,7 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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;
 

--- 1.257/sql/ha_ndbcluster.cc	2006-02-02 11:13:28 +01:00
+++ 1.258/sql/ha_ndbcluster.cc	2006-02-06 13:27:13 +01:00
@@ -9378,7 +9378,7 @@
   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 @@
   }
   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 @@
       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 @@
   }
   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 @@
   }
   case (ALTER_LOGFILE_GROUP):
   {
-    error= ER_ALTER_TABLESPACE_FAILED;
+    error= ER_ALTER_FILEGROUP_FAILED;
     if (info->undo_file_name == NULL)
     {
       /*
@@ -9507,7 +9507,7 @@
   }
   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 @@
   }
   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)))
     {