bzr commit into mysql-5.1-telco-6.3 branch (magnus.blaudd:2937)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/6.3/ based on revid:magnus.blaudd@stripped399gz9qyjw

 2937 Magnus Blåudd	2009-04-15 [merge]
      Merge

    modified:
      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]