Commit bbfa47d0 authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
parents b9d51b15 a4e3ac42

storage/ndb/src/common/util/socket_io.cpp

+5 −0
Original line number Diff line number Diff line
@@ -103,6 +103,11 @@ readln_socket(NDB_SOCKET_TYPE socket, int timeout_millis, 
	  ptr += t;

	  len -= t;

	}

	if (i > 0 && buf[i-1] == '\r')

	{

	  buf[i-1] = '\n';

	  ptr--;

	}

	ptr[0]= 0;

	return ptr - buf;

      }

storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp

+1 −0
Original line number Diff line number Diff line
@@ -719,6 +719,7 @@ Cmvmi::execTEST_ORD(Signal * signal){ 
      // Do nothing

      break;

    }

    globalSignalLoggers.flushSignalLog();

  }



#endif

storage/ndb/test/ndbapi/testDict.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1988,7 +1988,7 @@ runDictOps(NDBT_Context* ctx, NDBT_Step* step) 
    // create indexes

    const char** indlist = NDBT_Tables::getIndexes(tabName);

    uint indnum = 0;

    while (*indlist != 0) {

    while (indlist != 0 && *indlist != 0) {

      uint count = 0;

    try_create_index:

      count++;

storage/ndb/test/run-test/daily-basic-tests.txt

+1 −1
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ args: -n TemporaryTables T1 T6 T7 T8 


max-time: 1500

cmd: testDict

args: -n Restart_NR2 T1

args: -n Restart_NR2 T1 I3



#

# TEST NDBAPI