fixed warnings from the fix of 26243

7 files changed, 18 insertions, 17 deletions

diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index 7ed4f3a9f03..daa5886f3ba 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -1935,7 +1935,7 @@ int mi_sort_index(MI_CHECK *param, register MI_INFO *info, my_string name)
   for (key= 0,keyinfo= &share->keyinfo[0]; key < share->base.keys ;
        key++,keyinfo++)
     if (keyinfo->key_alg == HA_KEY_ALG_RTREE)
-      return 0;
+      DBUG_RETURN(0);
 
   if (!(param->testflag & T_SILENT))
     printf("- Sorting index for MyISAM-table '%s'\n",name);
diff --git a/myisam/mi_keycache.c b/myisam/mi_keycache.c
index bb465dbecce..6694893e9c3 100644
--- a/myisam/mi_keycache.c
+++ b/myisam/mi_keycache.c
@@ -158,4 +158,5 @@ void mi_change_key_cache(KEY_CACHE *old_key_cache,
   */
   multi_key_cache_change(old_key_cache, new_key_cache);
   pthread_mutex_unlock(&THR_LOCK_myisam);
+  DBUG_VOID_RETURN;
 }
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
index baf3bffccb8..f27ade7bfc0 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.c
@@ -551,7 +551,7 @@ finish:
   }
 #endif
   keycache_pthread_mutex_unlock(&keycache->cache_lock);
-  return blocks;
+  DBUG_RETURN(blocks);
 }
 
 
diff --git a/sql/examples/ha_tina.cc b/sql/examples/ha_tina.cc
index 0d1d821cf17..0b57fe86e62 100644
--- a/sql/examples/ha_tina.cc
+++ b/sql/examples/ha_tina.cc
@@ -883,7 +883,7 @@ int ha_tina::delete_all_rows()
   DBUG_ENTER("ha_tina::delete_all_rows");
 
   if (!records_is_known)
-    return (my_errno=HA_ERR_WRONG_COMMAND);
+    DBUG_RETURN(my_errno=HA_ERR_WRONG_COMMAND);
 
   /* Invalidate all cached mmap pages */
   if (free_mmap(share)) 
diff --git a/sql/item_func.cc b/sql/item_func.cc
index a6fb8a94b69..7416471d630 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -5115,7 +5115,7 @@ double Item_func_match::val_real()
     DBUG_RETURN(-1.0);
 
   if (key != NO_SUCH_KEY && table->null_row) /* NULL row from an outer join */
-    return 0.0;
+    DBUG_RETURN(0.0);
 
   if (join_key)
   {
diff --git a/sql/lock.cc b/sql/lock.cc
index cf06be5f95f..47458702033 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -703,7 +703,7 @@ static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, uint count,
     {
       my_error(ER_WRONG_LOCK_OF_SYSTEM_TABLE, MYF(0), table_ptr[i]->s->db,
                table_ptr[i]->s->table_name);
-      return 0;
+      DBUG_RETURN(0);
     }
   }
 
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc
index 2e90d00f8aa..4b3264069b5 100644
--- a/sql/sql_analyse.cc
+++ b/sql/sql_analyse.cc
@@ -195,13 +195,13 @@ bool test_if_number(NUM_INFO *info, const char *str, uint str_len)
   */
   for (; str != end && my_isspace(system_charset_info, *str); str++) ;
   if (str == end)
-    return 0;
+    DBUG_RETURN(0);
 
   if (*str == '-')
   {
     info->negative = 1;
     if (++str == end || *str == '0') // converting -0 to a number
-      return 0;			     // might lose information
+      DBUG_RETURN(0);		     // might lose information
   }
   else
     info->negative = 0;
@@ -219,33 +219,33 @@ bool test_if_number(NUM_INFO *info, const char *str, uint str_len)
     int error;
     info->ullval= (ulonglong) my_strtoll10(begin, &endpos, &error);
     if (info->integers == 1)
-      return 0;			     // a single number can't be zerofill
+      DBUG_RETURN(0);		     // a single number can't be zerofill
     info->maybe_zerofill = 1;
-    return 1;			     // a zerofill number, or an integer
+    DBUG_RETURN(1);		     // a zerofill number, or an integer
   }
   if (*str == '.' || *str == 'e' || *str == 'E')
   {
     if (info->zerofill)		     // can't be zerofill anymore
-      return 0;
+      DBUG_RETURN(0);
     if ((str + 1) == end)	     // number was something like '123[.eE]'
     {
       char *endpos= (char*) str;
       int error;
       info->ullval= (ulonglong) my_strtoll10(begin, &endpos, &error);
-      return 1;
+      DBUG_RETURN(1);
     }
     if (*str == 'e' || *str == 'E')  // number may be something like '1e+50'
     {
       str++;
       if (*str != '-' && *str != '+')
-	return	0;
+        DBUG_RETURN(0);
       for (str++; str != end && my_isdigit(system_charset_info,*str); str++) ;
       if (str == end)
       {
 	info->is_float = 1;	     // we can't use variable decimals here
-	return 1;
+        DBUG_RETURN(1);
       }
-      return 0;
+      DBUG_RETURN(0);
     }
     for (str++; *(end - 1) == '0'; end--);  // jump over zeros at the end
     if (str == end)		     // number was something like '123.000'
@@ -253,17 +253,17 @@ bool test_if_number(NUM_INFO *info, const char *str, uint str_len)
       char *endpos= (char*) str;
       int error;
       info->ullval= (ulonglong) my_strtoll10(begin, &endpos, &error);
-      return 1;
+      DBUG_RETURN(1);
     }
     for (; str != end && my_isdigit(system_charset_info,*str); str++)
       info->decimals++;
     if (str == end)
     {
       info->dval = my_atof(begin);
-      return 1;
+      DBUG_RETURN(1);
     }
   }
-  return 0;
+  DBUG_RETURN(0);
 }