Merge

magnus.blaudd@oracle.com · magnus.blaudd@oracle.com · commit f30676b4c02f · 2011-09-23T11:58:55.000+02:00
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
@@ -1347,8 +1347,8 @@ Thd_ndb::Thd_ndb(THD* thd) :
   m_pushed_queries_dropped= 0;
   m_pushed_queries_executed= 0;
   m_pushed_reads= 0;
-  bzero(m_transaction_no_hint_count, sizeof(m_transaction_no_hint_count));
-  bzero(m_transaction_hint_count, sizeof(m_transaction_hint_count));
+  memset(m_transaction_no_hint_count, 0, sizeof(m_transaction_no_hint_count));
+  memset(m_transaction_hint_count, 0, sizeof(m_transaction_hint_count));
   global_schema_lock_trans= NULL;
   global_schema_lock_count= 0;
   global_schema_lock_error= 0;
@@ -6195,7 +6195,7 @@ void ha_ndbcluster::unpack_record(uchar *dst_row, const uchar *src_row)
             production code.
           */
           if (actual_length < field->pack_length())
-            bzero(field->ptr + actual_length,
+            memset(field->ptr + actual_length, 0,
                   field->pack_length() - actual_length);
 #endif
           field->move_field_offset(-dst_offset);
@@ -6259,7 +6259,7 @@ static void get_default_value(void *def_val, Field *field)
           memcpy(def_val, src_ptr, actual_length);
 #ifdef HAVE_purify
           if (actual_length < field->pack_length())
-            bzero(((char*)def_val) + actual_length,
+            memset(((char*)def_val) + actual_length, 0,
                   field->pack_length() - actual_length);
 #endif
         }
@@ -7068,7 +7068,7 @@ void ha_ndbcluster::get_dynamic_partition_info(PARTITION_STATS *stat_info,
 {
   DBUG_PRINT("info", ("ha_ndbcluster::get_dynamic_partition_info"));
 
-  memset((char*) stat_info, 0, sizeof(PARTITION_STATS));
+  memset(stat_info, 0, sizeof(PARTITION_STATS));
   int error = 0;
   THD *thd = table->in_use;
 
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
@@ -216,7 +216,7 @@ struct Ndb_local_table_statistics {
 #include "ndb_thd_ndb.h"
 
 struct st_ndb_status {
-  st_ndb_status() { bzero(this, sizeof(struct st_ndb_status)); }
+  st_ndb_status() { memset(this, 0, sizeof(struct st_ndb_status)); }
   long cluster_node_id;
   const char * connected_host;
   long connected_port;
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
@@ -2887,7 +2887,7 @@ ndb_binlog_thread_handle_schema_event_post_epoch(THD *thd,
         }
         {
           TABLE_LIST table_list;
-          bzero((char*) &table_list,sizeof(table_list));
+          memset(&table_list, 0, sizeof(table_list));
           table_list.db= schema->db;
           table_list.alias= table_list.table_name= schema->name;
           close_cached_tables(thd, &table_list, FALSE, FALSE, FALSE);
@@ -2992,7 +2992,7 @@ ndb_binlog_thread_handle_schema_event_post_epoch(THD *thd,
           remote on-line alter table
         */
         TABLE_LIST table_list;
-        bzero((char*) &table_list,sizeof(table_list));
+        memset(&table_list, 0, sizeof(table_list));
         table_list.db= (char *)schema->db;
         table_list.alias= table_list.table_name= (char *)schema->name;
         close_cached_tables(thd, &table_list, TRUE, FALSE, FALSE);
@@ -3504,7 +3504,7 @@ inline void slave_reset_conflict_fn(NDB_SHARE *share)
   NDB_CONFLICT_FN_SHARE *cfn_share= share->m_cfn_share;
   if (cfn_share)
   {
-    bzero((char*)cfn_share, sizeof(*cfn_share));
+    memset(cfn_share, 0, sizeof(*cfn_share));
   }
 }
 
@@ -5828,7 +5828,7 @@ ndb_find_binlog_index_row(ndb_binlog_index_row **rows,
       if (row == NULL)
       {
         row= (ndb_binlog_index_row*)sql_alloc(sizeof(ndb_binlog_index_row));
-        bzero((char*)row, sizeof(ndb_binlog_index_row));
+        memset(row, 0, sizeof(ndb_binlog_index_row));
         row->next= first;
         *rows= row;
         if (found_id)
@@ -6895,7 +6895,7 @@ ndb_binlog_thread_func(void *arg)
         DBUG_PRINT("info", ("Initializing transaction"));
         inj->new_trans(thd, &trans);
         rows= &_row;
-        bzero((char*)&_row, sizeof(_row));
+        memset(&_row, 0, sizeof(_row));
         thd->variables.character_set_client= &my_charset_latin1;
         goto commit_to_binlog;
       }
