From 23461d77bca409cb48d982b8d547b63b22b934e9 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 21 Feb 2007 19:38:40 +0200 Subject: 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 --- extra/yassl/src/ssl.cpp | 2 +- extra/yassl/taocrypt/src/asn.cpp | 2 -- extra/yassl/testsuite/testsuite.cpp | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'extra') diff --git a/extra/yassl/src/ssl.cpp b/extra/yassl/src/ssl.cpp index 70198af79b4..837121c249d 100644 --- a/extra/yassl/src/ssl.cpp +++ b/extra/yassl/src/ssl.cpp @@ -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); diff --git a/extra/yassl/taocrypt/src/asn.cpp b/extra/yassl/taocrypt/src/asn.cpp index ef7a330b76d..5bc865a4ba7 100644 --- a/extra/yassl/taocrypt/src/asn.cpp +++ b/extra/yassl/taocrypt/src/asn.cpp @@ -747,8 +747,6 @@ void CertDecoder::GetName(NameType nt) idx += length2; } - source_.advance(oidSz + 1); - word32 length2 = GetLength(source_); source_.advance(length2); } } diff --git a/extra/yassl/testsuite/testsuite.cpp b/extra/yassl/testsuite/testsuite.cpp index 93b9b3d7026..06e75153341 100644 --- a/extra/yassl/testsuite/testsuite.cpp +++ b/extra/yassl/testsuite/testsuite.cpp @@ -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"); -- cgit v1.2.1