[Groonga-mysql-commit] mroonga/mroonga [master] don't call function in DBUG_RETURN(). refs #1196

Back to archive index

null+****@clear***** null+****@clear*****
2011年 12月 18日 (日) 12:37:01 JST


Kouhei Sutou	2011-12-18 03:37:01 +0000 (Sun, 18 Dec 2011)

  New Revision: 3a5fafa9f39fc40eda5e5beea027316feb55b950

  Log:
    don't call function in DBUG_RETURN(). refs #1196
    
    Calling function in DBUG_RETURN() may break a balance of
    DBUG_ENTER() and DBUG_RETURN().

  Modified files:
    ha_mroonga.cc

  Modified: ha_mroonga.cc (+2 -1)
===================================================================
--- ha_mroonga.cc    2011-12-17 18:01:16 +0000 (37f4626)
+++ ha_mroonga.cc    2011-12-18 03:37:01 +0000 (21d5c51)
@@ -8663,7 +8663,8 @@ bool ha_mroonga::wrapper_primary_key_is_clustered()
 bool ha_mroonga::storage_primary_key_is_clustered()
 {
   MRN_DBUG_ENTER_METHOD();
-  DBUG_RETURN(handler::primary_key_is_clustered());
+  bool is_clustered = handler::primary_key_is_clustered();
+  DBUG_RETURN(is_clustered);
 }
 
 bool ha_mroonga::primary_key_is_clustered()




Groonga-mysql-commit メーリングリストの案内
Back to archive index