bzr push into mysql-5.1-telco-6.2 branch (jonas:2842 to 2843) Bug#42974

[Jonas Oreland]

 2843 Jonas Oreland	2009-02-18
      ndb - bug#42974 - compile error with forte/visual studio
modified:
  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp

 2842 Jonas Oreland	2009-02-18
      fix tree name in 6.2
modified:
  .bzr-mysql/default.conf

=== modified file 'storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp'
--- a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2009-02-18 08:31:58 +0000
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2009-02-18 19:19:18 +0000
@@ -350,7 +350,7 @@ parse_spec(Vector<ddentry> & dst,
        */
       struct ddentry entry;
       const char * path = list[i].c_str();
-      char * sizeptr = strchr(path, ':');
+      char * sizeptr = const_cast<char*>(strchr(path, ':'));
       if (sizeptr == 0)
       {
         return -1;