bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:3053 to 3054)

[Martin Zaun]

 3054 Martin Zaun	2009-10-06 [merge]
      Merged from ndb-7.0 to ndb-7.1

    modified:
      extra/yassl/taocrypt/src/random.cpp
      include/config-win.h
      mysql-test/lib/My/SafeProcess/safe_process_win.cc
      storage/ndb/include/ndbapi/NdbDictionary.hpp
      storage/ndb/include/ndbapi/NdbOperation.hpp
      storage/ndb/src/ndbapi/NdbDictionary.cpp
      storage/ndb/src/ndbapi/NdbOperation.cpp
 3053 Jonas Oreland	2009-10-06 [merge]
      ndb - merge 70 to 71

    removed:
      mysys/mf_strip.c
    modified:
      include/my_sys.h
      mysql-test/suite/ndb/t/ndb_restore_compressed.test
      mysys/CMakeLists.txt
      mysys/Makefile.am
      sql/mysql_priv.h.pp
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
      storage/ndb/test/ndbapi/testMgmd.cpp
=== modified file 'extra/yassl/taocrypt/src/random.cpp'
--- a/extra/yassl/taocrypt/src/random.cpp	2009-05-26 18:53:34 +0000
+++ b/extra/yassl/taocrypt/src/random.cpp	2009-10-06 16:16:17 +0000
@@ -27,7 +27,6 @@
 #include <time.h>
 
 #if defined(_WIN32)
-    #define _WIN32_WINNT 0x0400
     #include <windows.h>
     #include <wincrypt.h>
 #else

=== modified file 'include/config-win.h'
--- a/include/config-win.h	2009-10-01 07:16:52 +0000
+++ b/include/config-win.h	2009-10-06 16:16:17 +0000
@@ -20,10 +20,6 @@
 
 #define BIG_TABLES
 
-/* We have to do this define before including windows.h to get the
-   AWE API functions.  this #define means we target Windows XP and newer */
-#define _WIN32_WINNT     0x0501
-
 #if defined(_MSC_VER) && _MSC_VER >= 1400
 /* Avoid endless warnings about sprintf() etc. being unsafe. */
 #define _CRT_SECURE_NO_DEPRECATE 1

=== modified file 'mysql-test/lib/My/SafeProcess/safe_process_win.cc'
--- a/mysql-test/lib/My/SafeProcess/safe_process_win.cc	2009-08-25 19:44:04 +0000
+++ b/mysql-test/lib/My/SafeProcess/safe_process_win.cc	2009-10-06 16:16:17 +0000
@@ -53,9 +53,6 @@
            is killed.
 */
 
-/* Requires Windows 2000 or higher */
-#define _WIN32_WINNT 0x0500
-
 #include <windows.h>
 #include <stdio.h>
 #include <tlhelp32.h>

=== modified file 'storage/ndb/include/ndbapi/NdbDictionary.hpp'
--- a/storage/ndb/include/ndbapi/NdbDictionary.hpp	2009-09-04 11:39:37 +0000
+++ b/storage/ndb/include/ndbapi/NdbDictionary.hpp	2009-10-07 03:23:07 +0000
@@ -2052,7 +2052,9 @@ public:
      * @return       -1 if error.
      *
      */
+#ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
     int listObjects(List & list, Object::Type type = Object::TypeUndefined);
+#endif
     int listObjects(List & list,
 		    Object::Type type = Object::TypeUndefined) const;
 
@@ -2106,7 +2108,9 @@ public:
      * @param tableName  Name of table that index belongs to.
      * @return  0 if successful, otherwise -1
      */
+#ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
     int listIndexes(List & list, const char * tableName);
+#endif
     int listIndexes(List & list, const char * tableName) const;
 
 #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
@@ -2151,7 +2155,9 @@ public:
      * @param list   List of events returned in the dictionary
      * @return 0 if successful otherwise -1.
      */
+#ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
     int listEvents(List & list);
+#endif
     int listEvents(List & list) const;
 
     /** @} *******************************************************************/

=== modified file 'storage/ndb/include/ndbapi/NdbOperation.hpp'
--- a/storage/ndb/include/ndbapi/NdbOperation.hpp	2009-06-13 19:12:11 +0000
+++ b/storage/ndb/include/ndbapi/NdbOperation.hpp	2009-10-07 03:23:07 +0000
@@ -878,7 +878,9 @@ public:
    * 
    * @return method number where the error occured.
    */
+#ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
   int getNdbErrorLine();
+#endif
   int getNdbErrorLine() const;
 
   /**
@@ -1521,7 +1523,9 @@ inline
 int
 NdbOperation::getNdbErrorLine()
 {
-  return theErrorLine;
+  // delegate to overloaded const function for same semantics
+  const NdbOperation * const cthis = this;
+  return cthis->NdbOperation::getNdbErrorLine();
 }
 
 inline

=== modified file 'storage/ndb/src/ndbapi/NdbDictionary.cpp'
--- a/storage/ndb/src/ndbapi/NdbDictionary.cpp	2009-08-06 14:51:07 +0000
+++ b/storage/ndb/src/ndbapi/NdbDictionary.cpp	2009-10-07 03:23:07 +0000
@@ -2563,7 +2563,9 @@ NdbDictionary::Dictionary::getEvent(cons
 int
 NdbDictionary::Dictionary::listEvents(List& list)
 {
-  return m_impl.listEvents(list);
+  // delegate to overloaded const function for same semantics
+  const NdbDictionary::Dictionary * const cthis = this;
+  return cthis->NdbDictionary::Dictionary::listEvents(list);
 }
 
 int
@@ -2575,7 +2577,9 @@ NdbDictionary::Dictionary::listEvents(Li
 int
 NdbDictionary::Dictionary::listObjects(List& list, Object::Type type)
 {
-  return m_impl.listObjects(list, type);
+  // delegate to overloaded const function for same semantics
+  const NdbDictionary::Dictionary * const cthis = this;
+  return cthis->NdbDictionary::Dictionary::listObjects(list, type);
 }
 
 int
@@ -2587,12 +2591,9 @@ NdbDictionary::Dictionary::listObjects(L
 int
 NdbDictionary::Dictionary::listIndexes(List& list, const char * tableName)
 {
-  const NdbDictionary::Table* tab= getTable(tableName);
-  if(tab == 0)
-  {
-    return -1;
-  }
-  return m_impl.listIndexes(list, tab->getTableId());
+  // delegate to overloaded const function for same semantics
+  const NdbDictionary::Dictionary * const cthis = this;
+  return cthis->NdbDictionary::Dictionary::listIndexes(list, tableName);
 }
 
 int

=== modified file 'storage/ndb/src/ndbapi/NdbOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbOperation.cpp	2009-05-27 15:21:45 +0000
+++ b/storage/ndb/src/ndbapi/NdbOperation.cpp	2009-10-07 02:56:19 +0000
@@ -388,6 +388,9 @@ NdbOperation::setValue(Uint32 anAttrId, 
 NdbBlob*
 NdbOperation::getBlobHandle(const char* anAttrName)
 {
+  // semantics differs from overloaded 'getBlobHandle(const char*) const'
+  // by delegating to the non-const variant of internal getBlobHandle(...),
+  // which may create a new BlobHandle
   const NdbColumnImpl* col = m_currentTable->getColumn(anAttrName);
   if (col == NULL)
   {
@@ -403,6 +406,9 @@ NdbOperation::getBlobHandle(const char* 
 NdbBlob*
 NdbOperation::getBlobHandle(Uint32 anAttrId)
 {
+  // semantics differs from overloaded 'getBlobHandle(Uint32) const'
+  // by delegating to the non-const variant of internal getBlobHandle(...),
+  // which may create a new BlobHandle
   const NdbColumnImpl* col = m_currentTable->getColumn(anAttrId);
   if (col == NULL)
   {


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