List:Commits« Previous MessageNext Message »
From:jonas oreland Date:July 1 2011 10:33am
Subject:bzr push into mysql-5.1-telco-7.1 branch (jonas.oreland:4274 to 4275)
View as plain text  
 4275 jonas oreland	2011-07-01 [merge]
      ndb - merge 70 to 71

    modified:
      sql/Makefile.am
      sql/ha_ndb_index_stat.cc
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      storage/ndb/ndb_configure.m4
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
 4274 magnus.blaudd@stripped	2011-07-01 [merge]
      Merge 7.0 -> 7.1

    added:
      mysql-test/suite/ndb/bug12712109.ini
    modified:
      mysql-test/suite/ndb/r/ndb_config.result
      mysql-test/suite/ndb/t/ndb_config.test
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2011-06-29 23:28:01 +0000
+++ b/sql/Makefile.am	2011-07-01 09:00:54 +0000
@@ -133,7 +133,7 @@ mysqld_SOURCES =	sql_lex.cc sql_handler.
 
 nodist_mysqld_SOURCES =	mini_client_errors.c pack.c client.c my_time.c my_user.c 
 
-libndb_la_CPPFLAGS=	@ndbcluster_includes@
+libndb_la_CPPFLAGS=	@ndbcluster_includes@ @ndbcluster_sql_defines@
 libndb_la_SOURCES=	ha_ndbcluster.cc \
 			ha_ndbcluster_binlog.cc \
 			ha_ndbcluster_connection.cc \

=== modified file 'sql/ha_ndb_index_stat.cc'
--- a/sql/ha_ndb_index_stat.cc	2011-06-25 15:07:07 +0000
+++ b/sql/ha_ndb_index_stat.cc	2011-07-01 09:00:54 +0000
@@ -486,7 +486,7 @@ ndb_index_stat_option_update(MYSQL_THD,
   DBUG_PRINT("index_stat", ("str: %s", str));
   Ndb_index_stat_opt& opt= ndb_index_stat_opt;
   int ret= ndb_index_stat_str2opt(str, opt);
-  assert(ret == 0);
+  assert(ret == 0); NDB_IGNORE_VALUE(ret);
   *(const char**)var_ptr= ndb_index_stat_opt.option;
   DBUG_VOID_RETURN;
 }
@@ -701,7 +701,7 @@ ndb_index_stat_list_to_error(Ndb_index_s
   Ndb_index_stat_glob &glob= ndb_index_stat_glob;
 
   assert(st != 0);
-  const int lt= st->lt;
+  const int lt= st->lt; NDB_IGNORE_VALUE(lt);
   assert(1 <= lt && lt < Ndb_index_stat::LT_Count);
   assert(lt != Ndb_index_stat::LT_Error);
 

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-06-29 23:45:11 +0000
+++ b/sql/ha_ndbcluster.cc	2011-07-01 10:32:33 +0000
@@ -615,8 +615,8 @@ static int check_slave_state(THD* thd)
 
           const Uint32 server_id_col_num = 0;
           const Uint32 epoch_col_num = 1;
-          NdbRecAttr* server_id_ra;
-          NdbRecAttr* epoch_ra;
+          NdbRecAttr* server_id_ra = 0;
+          NdbRecAttr* epoch_ra = 0;
 
           if (unlikely((sop->readTuples(NdbOperation::LM_CommittedRead) != 0)   ||
                        ((server_id_ra = sop->getValue(server_id_col_num)) == NULL)  ||
@@ -5520,7 +5520,7 @@ void ha_ndbcluster::unpack_record(uchar
           my_bitmap_map *old_map=
             dbug_tmp_use_all_columns(table, table->write_set);
           int res = field_bit->store(value, true);
-          assert(res == 0);
+          assert(res == 0); NDB_IGNORE_VALUE(res);
           dbug_tmp_restore_column_map(table->write_set, old_map);
           field->move_field_offset(-dst_offset);
         }
@@ -9403,7 +9403,7 @@ int ha_ndbcluster::rename_table(const ch
                              share->key, share->use_count));
     ndbcluster_prepare_rename_share(share, to);
     int ret = ndbcluster_rename_share(thd, share);
-    assert(ret == 0);
+    assert(ret == 0); NDB_IGNORE_VALUE(ret);
   }
 
   NdbDictionary::Table new_tab= *orig_tab;
@@ -9414,7 +9414,7 @@ int ha_ndbcluster::rename_table(const ch
     if (share)
     {
       int ret = ndbcluster_undo_rename_share(thd, share);
-      assert(ret == 0);
+      assert(ret == 0); NDB_IGNORE_VALUE(ret);
       /* ndb_share reference temporary free */
       DBUG_PRINT("NDB_SHARE", ("%s temporary free  use_count: %u",
                                share->key, share->use_count));

=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h	2011-06-29 23:45:11 +0000
+++ b/sql/ha_ndbcluster.h	2011-07-01 10:32:33 +0000
@@ -34,6 +34,8 @@
 #include <ndbapi/ndbapi_limits.h>
 #include <kernel/ndb_limits.h>
 
+#define NDB_IGNORE_VALUE(x) (void)x
+
 #define NDB_HIDDEN_PRIMARY_KEY_LENGTH 8
 
 class Ndb;             // Forward declaration

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-06-29 23:28:01 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-07-01 09:00:54 +0000
@@ -5363,7 +5363,7 @@ ndbcluster_create_event_ops(THD *thd, ND
     {
       // set injector_ndb database/schema from table internal name
       int ret= ndb->setDatabaseAndSchemaName(ndbtab);
-      assert(ret == 0);
+      assert(ret == 0); NDB_IGNORE_VALUE(ret);
       op= ndb->createEventOperation(event_name);
       // reset to catch errors
       ndb->setDatabaseName("");
@@ -6672,7 +6672,7 @@ restart_cluster_failure:
       };
     int ret = inj->record_incident(thd, INCIDENT_LOST_EVENTS,
                                    msg[incident_id]);
-    assert(ret == 0);
+    assert(ret == 0); NDB_IGNORE_VALUE(ret);
     do_incident = false; // Don't report incident again, unless we get started
     break;
   }
@@ -7115,7 +7115,7 @@ restart_cluster_failure:
                                 table->s->fields));
             injector::transaction::table tbl(table, true);
             int ret = trans.use_table(::server_id, tbl);
-            assert(ret == 0);
+            assert(ret == 0); NDB_IGNORE_VALUE(ret);
           }
         }
         if (trans.good())
@@ -7129,7 +7129,7 @@ restart_cluster_failure:
 #endif
             injector::transaction::table tbl(apply_status_table, true);
             int ret = trans.use_table(::server_id, tbl);
-            assert(ret == 0);
+            assert(ret == 0); NDB_IGNORE_VALUE(ret);
 
             /* add the gci to the record */
             Field *field= apply_status_table->field[1];

=== modified file 'storage/ndb/ndb_configure.m4'
--- a/storage/ndb/ndb_configure.m4	2011-06-29 08:17:07 +0000
+++ b/storage/ndb/ndb_configure.m4	2011-07-01 10:32:33 +0000
@@ -599,6 +599,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
   ndbcluster_includes="-I\$(top_builddir)/storage/ndb/include -I\$(top_srcdir)/storage/ndb/include -I\$(top_srcdir)/storage/ndb/include/ndbapi -I\$(top_srcdir)/storage/ndb/include/mgmapi"
   ndbcluster_libs="\$(top_builddir)/storage/ndb/src/.libs/libndbclient.a"
   ndbcluster_system_libs=""
+  ndbcluster_sql_defines=""
 
   MYSQL_CHECK_NDB_OPTIONS
   NDB_CHECK_NDBMTD
@@ -694,6 +695,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
     then
       NDB_DEFS=""
     else
+      ndbcluster_sql_defines="-DNDEBUG"
       NDB_DEFS="-DNDEBUG"
     fi
   fi
@@ -817,6 +819,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
   AC_SUBST(ndbcluster_libs)
   AC_SUBST(ndbcluster_system_libs)
   AC_SUBST(NDB_SCI_LIBS)
+  AC_SUBST(ndbcluster_sql_defines)
 
   AC_SUBST(ndb_transporter_opt_objs)
   AC_SUBST(ndb_bin_am_ldflags)

=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-06-30 08:27:52 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-07-01 10:02:15 +0000
@@ -507,7 +507,7 @@ void NdbBulkAllocator::reset(){
   // Overwrite with 0xff bytes to detect accidental use of released memory.
   assert(m_buffer == NULL || 
          memset(m_buffer, 0xff, m_maxObjs * m_objSize) != NULL);
-  delete m_buffer;
+  delete [] m_buffer;
   m_buffer = NULL;
   m_nextObjNo = 0;
   m_maxObjs = 0;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.1 branch (jonas.oreland:4274 to 4275) jonas oreland4 Jul