Commit 182ac007 authored by unknown's avatar unknown
Browse files

Merge poseidon.mysql.com:/home/tomas/mysql-5.1 

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


client/sql_string.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  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/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
parents 793a137d f1aaf6f6

storage/myisam/mi_open.c

+2 −0
Original line number Diff line number Diff line
@@ -506,6 +506,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) 
      share->data_file_type = DYNAMIC_RECORD;

    my_afree((gptr) disk_cache);

    mi_setup_functions(share);

#ifdef HAVE_MMAP

    if (open_flags & HA_OPEN_MMAP)

    {

      info.s= share;
@@ -522,6 +523,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) 
        share->file_write= mi_mmap_pwrite;

      }

    }

#endif /* HAVE_MMAP */

    share->is_log_table= FALSE;

#ifdef THREAD

    thr_lock_init(&share->lock);

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

+2 −1
Original line number Diff line number Diff line
@@ -212,7 +212,8 @@ public: 
    NullablePrimaryKey = 740,

    UnsupportedChange = 741,

    BackupInProgress = 762,

    IncompatibleVersions = 763

    IncompatibleVersions = 763,

    SingleUser = 299

  };



private:

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

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ public: 
    AllocationError = 4252,

    CreateIndexTableFailed = 4253,

    DuplicateAttributes = 4258,

    SingleUser = 299,

    TableIsTemporary = 776,

    TableIsNotTemporary = 777,

    NoLoggingTemporaryIndex = 778

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

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ public: 
    InvalidPrimaryKeySize  = 739,

    NullablePrimaryKey = 740,

    InvalidCharset = 743,

    SingleUser = 299,

    InvalidTablespace = 755,

    VarsizeBitfieldNotSupported = 757,

    NotATablespace = 758,

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

+2 −1
Original line number Diff line number Diff line
@@ -172,7 +172,8 @@ public: 
    IndexNotFound = 4243,

    BadRequestType = 4247,

    InvalidName = 4248,

    NotAnIndex = 4254

    NotAnIndex = 4254,

    SingleUser = 299

  };

  STATIC_CONST( SignalLength = DropIndxConf::SignalLength + 3 );