bzr push into mysql-5.1-telco-6.2 branch (magnus.blaudd:2904 to 2905) Bug#44036

[Magnus Blåudd]

 2905 Magnus Blåudd	2009-04-15
      Bug#44036 compiler error - ndberror.c contains C++ comment
       - Add "return 0" to please compilers
       - Update copyright

    modified:
      storage/ndb/src/ndbapi/ndberror_check.cpp
 2904 Magnus Blåudd	2009-04-14 [merge]
      Merge

    removed:
      storage/ndb/src/ndbapi/signal-sender/
      storage/ndb/src/ndbapi/signal-sender/Makefile
      storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp
      storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp
    renamed:
      storage/ndb/src/ndbapi/ndberror_check.c => storage/ndb/src/ndbapi/ndberror_check.cpp
    modified:
      storage/ndb/include/ndbapi/NdbScanOperation.hpp
      storage/ndb/src/common/portlib/NdbThread.c
      storage/ndb/src/ndbapi/Makefile.am
      storage/ndb/src/ndbapi/NdbBlob.cpp
      storage/ndb/src/ndbapi/NdbDictionary.cpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/src/ndbapi/ndberror_check.cpp
=== modified file 'storage/ndb/src/ndbapi/ndberror_check.cpp'
--- a/storage/ndb/src/ndbapi/ndberror_check.cpp	2009-04-08 13:35:51 +0000
+++ b/storage/ndb/src/ndbapi/ndberror_check.cpp	2009-04-15 08:07:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (C) 2007-2008 MySQL AB, 2009 Sun Microsystems, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 size_t my_snprintf(char* to, size_t n, const char* fmt, ...)
 {
   abort();
+  return 0;
 }
 
 

Attachment: [text/bzr-bundle] bzr/[e-mail]