Commit af374b9d authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 

into mysql.com:/home/jonas/src/mysql-5.0-ndb
parents adb94a07 db261667

ndb/src/kernel/blocks/dbdict/Dbdict.cpp

+8 −8
Original line number Diff line number Diff line
@@ -1013,7 +1013,7 @@ void Dbdict::readSchemaConf(Signal* signal, 
    ndbrequire(rr.firstPage == 0);

    SchemaFile * sf = &xsf->schemaPage[0];

    Uint32 noOfPages;

    if (sf->NdbVersion < NDB_SF_VERSION_5_0_5) {

    if (sf->NdbVersion < NDB_SF_VERSION_5_0_6) {

      jam();

      const Uint32 pageSize_old = 32 * 1024;

      noOfPages = pageSize_old / NDB_SF_PAGE_SIZE - 1;
@@ -1032,8 +1032,8 @@ void Dbdict::readSchemaConf(Signal* signal, 
  SchemaFile * sf0 = &xsf->schemaPage[0];

  xsf->noOfPages = sf0->FileSize / NDB_SF_PAGE_SIZE;



  if (sf0->NdbVersion < NDB_SF_VERSION_5_0_5 &&

      ! convertSchemaFileTo_5_0_5(xsf)) {

  if (sf0->NdbVersion < NDB_SF_VERSION_5_0_6 &&

      ! convertSchemaFileTo_5_0_6(xsf)) {

    jam();

    ndbrequire(! crashInd);

    ndbrequire(fsPtr.p->fsState == FsConnectRecord::READ_SCHEMA1);
@@ -1113,7 +1113,7 @@ void Dbdict::closeReadSchemaConf(Signal* signal, 
}//Dbdict::closeReadSchemaConf()



bool

Dbdict::convertSchemaFileTo_5_0_5(XSchemaFile * xsf)

Dbdict::convertSchemaFileTo_5_0_6(XSchemaFile * xsf)

{

  const Uint32 pageSize_old = 32 * 1024;

  Uint32 page_old[pageSize_old >> 2];
@@ -2175,8 +2175,8 @@ void Dbdict::execSCHEMA_INFO(Signal* signal) 
  releaseSections(signal);

  

  SchemaFile * sf0 = &xsf->schemaPage[0];

  if (sf0->NdbVersion < NDB_SF_VERSION_5_0_5) {

    bool ok = convertSchemaFileTo_5_0_5(xsf);

  if (sf0->NdbVersion < NDB_SF_VERSION_5_0_6) {

    bool ok = convertSchemaFileTo_5_0_6(xsf);

    ndbrequire(ok);

  }
@@ -11922,8 +11922,8 @@ Dbdict::initSchemaFile(XSchemaFile * xsf, Uint32 firstPage, Uint32 lastPage, 
      memset(sf, 0, NDB_SF_PAGE_SIZE);



    Uint32 ndb_version = NDB_VERSION;

    if (ndb_version < NDB_SF_VERSION_5_0_5)

      ndb_version = NDB_SF_VERSION_5_0_5;

    if (ndb_version < NDB_SF_VERSION_5_0_6)

      ndb_version = NDB_SF_VERSION_5_0_6;



    memcpy(sf->Magic, NDB_SF_MAGIC, sizeof(sf->Magic));

    sf->ByteOrder = 0x12345678;

ndb/src/kernel/blocks/dbdict/Dbdict.hpp

+1 −1
Original line number Diff line number Diff line
@@ -1703,7 +1703,7 @@ private: 
  void readSchemaRef(Signal* signal, FsConnectRecordPtr fsPtr);

  void closeReadSchemaConf(Signal* signal,

                           FsConnectRecordPtr fsPtr);

  bool convertSchemaFileTo_5_0_5(XSchemaFile*);

  bool convertSchemaFileTo_5_0_6(XSchemaFile*);



  /* ------------------------------------------------------------ */

  // Get table definitions

ndb/src/kernel/blocks/dbdict/SchemaFile.hpp

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#define NDB_SF_MAX_PAGES                160



// versions where format changed

#define NDB_SF_VERSION_5_0_5            MAKE_VERSION(5, 0, 5)

#define NDB_SF_VERSION_5_0_6            MAKE_VERSION(5, 0, 6)



// One page in schema file.

struct SchemaFile {
@@ -71,7 +71,7 @@ struct SchemaFile { 
    }

  };



  // pre-5.0.5

  // pre-5.0.6

  struct TableEntry_old {

    Uint32 m_tableState;

    Uint32 m_tableVersion;

ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ NDB_COMMAND(printSchemafile, 
    }



    SchemaFile* sf = (SchemaFile *)&buf[0];

    if (sf->NdbVersion < NDB_SF_VERSION_5_0_5)

    if (sf->NdbVersion < NDB_SF_VERSION_5_0_6)

      print_old(filename, sf);

    else

      print(filename, sf, sz);

ndb/test/ndbapi/testScan.cpp

+1 −0
Original line number Diff line number Diff line
@@ -317,6 +317,7 @@ int runScanReadIndex(NDBT_Context* ctx, NDBT_Step* step){ 
    g_info << i << ": ";

    bool sort = (rand() % 100) > 50 ? true : false;

    bool desc = (rand() % 100) > 50 ? true : false;

    desc = false;       // random causes too many deadlocks

    int scan_flags =

      (NdbScanOperation::SF_OrderBy & -(int)sort) |

      (NdbScanOperation::SF_Descending & -(int)desc);