wl2723 - ndb opt. nr

mysql-test/t/rpl_multi_engine.test:
  merge fix
libmysqld/sql_tablespace.cc:
  New BitKeeper file ``libmysqld/sql_tablespace.cc''
mysql-test/r/ndb_basic_disk.result:
  New BitKeeper file ``mysql-test/r/ndb_basic_disk.result''
mysql-test/t/ndb_basic_disk.test:
  New BitKeeper file ``mysql-test/t/ndb_basic_disk.test''
sql/sql_tablespace.cc:
  New BitKeeper file ``sql/sql_tablespace.cc''
storage/ndb/src/kernel/blocks/OptNR.txt:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/OptNR.txt''
storage/ndb/src/kernel/vm/mem.txt:
  New BitKeeper file ``storage/ndb/src/kernel/vm/mem.txt''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp''
storage/ndb/tools/ndb_error_reporter:
  New BitKeeper file ``storage/ndb/tools/ndb_error_reporter''

1 files changed, 12 insertions, 12 deletions

diff --git a/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp b/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp
index 2062ec3e345..cca77fec924 100644
--- a/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp
@@ -68,9 +68,9 @@ struct CreateFilegroupImplRef {
 
   enum ErrorCode {
     NoError = 0,
-    FilegroupAlreadyExists = 1,
-    OutOfFilegroupRecords = 2,
-    OutOfLogBufferMemory = 3
+    FilegroupAlreadyExists = 1502,
+    OutOfFilegroupRecords = 1503,
+    OutOfLogBufferMemory = 1504
   };
   
   Uint32 senderData;
@@ -155,15 +155,15 @@ struct CreateFileImplRef {
 
   enum ErrorCode {
     NoError = 0,
-    InvalidFilegroup = 1,
-    InvalidFilegroupVersion = 2,
-    FileNoAlreadyExists = 3,
-    OutOfFileRecords = 4,
-    FileError = 5,
-    InvalidFileMetadata = 6,
-    OutOfMemory = 7,
-    FileReadError = 8,
-    FilegroupNotOnline = 9
+    InvalidFilegroup = 1505,
+    InvalidFilegroupVersion = 1506,
+    FileNoAlreadyExists = 1507,
+    OutOfFileRecords = 1508,
+    FileError = 1509,
+    InvalidFileMetadata = 1510,
+    OutOfMemory = 1511,
+    FileReadError = 1512,
+    FilegroupNotOnline = 1513
   };
   
   Uint32 senderData;