[Groonga-mysql-commit] mroonga/mroonga [master] mysql56: use 0 instead of NULL for memset()

Back to archive index

Kouhei Sutou null+****@clear*****
Wed Dec 26 11:14:50 JST 2012


Kouhei Sutou	2012-12-26 11:14:50 +0900 (Wed, 26 Dec 2012)

  New Revision: 37f7ccbd44a5325d0ab4a559577158ea74b06eba
  https://github.com/mroonga/mroonga/commit/37f7ccbd44a5325d0ab4a559577158ea74b06eba

  Log:
    mysql56: use 0 instead of NULL for memset()
    
    Because memset() writes a byte value not pointer value.

  Modified files:
    ha_mroonga.cpp

  Modified: ha_mroonga.cpp (+4 -4)
===================================================================
--- ha_mroonga.cpp    2012-12-26 10:19:25 +0900 (f8236d0)
+++ ha_mroonga.cpp    2012-12-26 11:14:50 +0900 (070a819)
@@ -12176,8 +12176,8 @@ bool ha_mroonga::wrapper_inplace_alter_table(
   uint *key_parser_length;
   KEY *p_key_info = &table->key_info[table_share->primary_key];
   bool need_fill_index = FALSE;
-  memset(index_tables, NULL, sizeof(grn_obj *) * ha_alter_info->key_count);
-  memset(index_columns, NULL, sizeof(grn_obj *) * ha_alter_info->key_count);
+  memset(index_tables, 0, sizeof(grn_obj *) * ha_alter_info->key_count);
+  memset(index_columns, 0, sizeof(grn_obj *) * ha_alter_info->key_count);
   tmp_table_share.keys = ha_alter_info->key_count;
   if (!(tmp_share = (MRN_SHARE *)
     my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),
@@ -12326,8 +12326,8 @@ bool ha_mroonga::storage_inplace_alter_table(
   uint *key_parser_length;
   KEY *p_key_info = &table->key_info[table_share->primary_key];
   bool have_multiple_column_index = FALSE;
-  memset(index_tables, NULL, sizeof(grn_obj *) * ha_alter_info->key_count);
-  memset(index_columns, NULL, sizeof(grn_obj *) * ha_alter_info->key_count);
+  memset(index_tables, 0, sizeof(grn_obj *) * ha_alter_info->key_count);
+  memset(index_columns, 0, sizeof(grn_obj *) * ha_alter_info->key_count);
   tmp_table_share.keys = ha_alter_info->key_count;
   if (!(tmp_share = (MRN_SHARE *)
     my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),
-------------- next part --------------
HTML����������������������������...
Télécharger 



More information about the Groonga-mysql-commit mailing list
Back to archive index