Commit e5706080 authored by unknown's avatar unknown
Browse files

After merge fixes 

This also fixes a bug in counting number of rows that are updated when we have many simultanous queries


extra/yassl/src/ssl.cpp:
  Removed compiler warning
extra/yassl/taocrypt/src/asn.cpp:
  After merge fixes
extra/yassl/testsuite/testsuite.cpp:
  Removed compiler warning
mysql-test/r/ndb_lock.result:
  After merge fixes
ndb/src/common/debugger/EventLogger.cpp:
  Removed compiler warning
ndb/src/common/util/ConfigValues.cpp:
  Removed compiler warning
ndb/src/common/util/NdbSqlUtil.cpp:
  Removed compiler warning
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Removed compiler warning
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  Removed compiler warning
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  Removed compiler warning
ndb/src/kernel/vm/ndbd_malloc.cpp:
  Removed compiler warning
ndb/src/mgmclient/main.cpp:
  Removed compiler warning
ndb/src/ndbapi/SignalSender.cpp:
  Removed compiler warning
sql/ha_ndbcluster.cc:
  Some extra safety
sql/item_cmpfunc.cc:
  After merge fixes
sql/item_subselect.cc:
  After merge fixes
sql/sql_insert.cc:
  After merge fixes
  (This actually fixes a bug in old code when many connections are in use)
support-files/compiler_warnings.supp:
  Removed some suppressed warnings
parent 1384e640

extra/yassl/src/ssl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -950,7 +950,7 @@ void ERR_print_errors_fp(FILE* /*fp*/) 


char* ERR_error_string(unsigned long errNumber, char* buffer)

{

    static char* msg = "Please supply a buffer for error string";

  static char* msg = (char*) "Please supply a buffer for error string";



    if (buffer) {

        SetErrorString(YasslError(errNumber), buffer);

extra/yassl/taocrypt/src/asn.cpp

+0 −2
Original line number Diff line number Diff line
@@ -747,8 +747,6 @@ void CertDecoder::GetName(NameType nt) 
                idx += length2;

            }



            source_.advance(oidSz + 1);

            word32 length2 = GetLength(source_);

            source_.advance(length2);

        }

    }

extra/yassl/testsuite/testsuite.cpp

+2 −2
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ int main(int argc, char** argv) 
            // input output compare

    byte input[TaoCrypt::MD5::DIGEST_SIZE];

    byte output[TaoCrypt::MD5::DIGEST_SIZE];

    file_test("input", input);

    file_test("output", output);

    file_test((char*) "input", input);

    file_test((char*) "output", output);

    assert(memcmp(input, output, sizeof(input)) == 0);



    printf("\nAll tests passed!\n");

mysql-test/r/ndb_lock.result

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ select * from t1 where x = 1 for update; 
x	y	z

1	one	1

select * from t1 where x = 2 for update;

ERROR HY000: Lock wait timeout exceeded; try restarting transaction

Got one of the listed errors

rollback;

commit;

begin;

ndb/src/common/debugger/EventLogger.cpp

+3 −0
Original line number Diff line number Diff line
@@ -913,6 +913,8 @@ EventLogger::close() 
  removeAllHandlers();

}



#ifdef NOT_USED



static NdbOut&

operator<<(NdbOut& out, const LogLevel & ll)

{
@@ -922,6 +924,7 @@ operator<<(NdbOut& out, const LogLevel & ll) 
  out << "]";

  return out;

}

#endif



int

EventLoggerBase::event_lookup(int eventType,