1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed warnings from the fix of 26243

Browse Source
This commit is contained in:
gkodinov/kgeorge@macbook.gmz 2008-03-29 17:50:46 +02:00
parent 84f761daaf
commit fd9993db87
7 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
myisam/mi_check.c
View File

@ -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 ; for (key= 0,keyinfo= &share->keyinfo[0]; key < share->base.keys ;
key++,keyinfo++) key++,keyinfo++)
if (keyinfo->key_alg == HA_KEY_ALG_RTREE) if (keyinfo->key_alg == HA_KEY_ALG_RTREE)
return 0; DBUG_RETURN(0);
if (!(param->testflag & T_SILENT)) if (!(param->testflag & T_SILENT))
printf("- Sorting index for MyISAM-table '%s'\n",name); printf("- Sorting index for MyISAM-table '%s'\n",name);

1
myisam/mi_keycache.c
View File

@ -158,4 +158,5 @@ void mi_change_key_cache(KEY_CACHE *old_key_cache,
*/ */
multi_key_cache_change(old_key_cache, new_key_cache); multi_key_cache_change(old_key_cache, new_key_cache);
pthread_mutex_unlock(&THR_LOCK_myisam); pthread_mutex_unlock(&THR_LOCK_myisam);
DBUG_VOID_RETURN;
} }

2
mysys/mf_keycache.c
View File

@ -551,7 +551,7 @@ finish:
} }
#endif #endif
keycache_pthread_mutex_unlock(&keycache->cache_lock); keycache_pthread_mutex_unlock(&keycache->cache_lock);
return blocks; DBUG_RETURN(blocks);
} }

2
sql/examples/ha_tina.cc
View File

@ -883,7 +883,7 @@ int ha_tina::delete_all_rows()
DBUG_ENTER("ha_tina::delete_all_rows"); DBUG_ENTER("ha_tina::delete_all_rows");
if (!records_is_known) if (!records_is_known)
return (my_errno=HA_ERR_WRONG_COMMAND); DBUG_RETURN(my_errno=HA_ERR_WRONG_COMMAND);
/* Invalidate all cached mmap pages */ /* Invalidate all cached mmap pages */
if (free_mmap(share)) if (free_mmap(share))

2
sql/item_func.cc
View File

@ -5115,7 +5115,7 @@ double Item_func_match::val_real()
DBUG_RETURN(-1.0); DBUG_RETURN(-1.0);
if (key != NO_SUCH_KEY && table->null_row) /* NULL row from an outer join */ if (key != NO_SUCH_KEY && table->null_row) /* NULL row from an outer join */
return 0.0; DBUG_RETURN(0.0);
if (join_key) if (join_key)
{ {

2
sql/lock.cc
View File

@ -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, my_error(ER_WRONG_LOCK_OF_SYSTEM_TABLE, MYF(0), table_ptr[i]->s->db,
table_ptr[i]->s->table_name); table_ptr[i]->s->table_name);
return 0; DBUG_RETURN(0);
} }
} }

24
sql/sql_analyse.cc
View File

@ -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++) ; for (; str != end && my_isspace(system_charset_info, *str); str++) ;
if (str == end) if (str == end)
return 0; DBUG_RETURN(0);
if (*str == '-') if (*str == '-')
{ {
info->negative = 1; info->negative = 1;
if (++str == end || *str == '0') // converting -0 to a number if (++str == end || *str == '0') // converting -0 to a number
return 0; // might lose information DBUG_RETURN(0); // might lose information
} }
else else
info->negative = 0; info->negative = 0;
@ -219,33 +219,33 @@ bool test_if_number(NUM_INFO *info, const char *str, uint str_len)
int error; int error;
info->ullval= (ulonglong) my_strtoll10(begin, &endpos, &error); info->ullval= (ulonglong) my_strtoll10(begin, &endpos, &error);
if (info->integers == 1) 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; 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 (*str == '.' || *str == 'e' || *str == 'E')
{ {
if (info->zerofill) // can't be zerofill anymore if (info->zerofill) // can't be zerofill anymore
return 0; DBUG_RETURN(0);
if ((str + 1) == end) // number was something like '123[.eE]' if ((str + 1) == end) // number was something like '123[.eE]'
{ {
char *endpos= (char*) str; char *endpos= (char*) str;
int error; int error;
info->ullval= (ulonglong) my_strtoll10(begin, &endpos, &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' if (*str == 'e' || *str == 'E') // number may be something like '1e+50'
{ {
str++; str++;
if (*str != '-' && *str != '+') if (*str != '-' && *str != '+')
return 0; DBUG_RETURN(0);
for (str++; str != end && my_isdigit(system_charset_info,*str); str++) ; for (str++; str != end && my_isdigit(system_charset_info,*str); str++) ;
if (str == end) if (str == end)
{ {
info->is_float = 1; // we can't use variable decimals here 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 for (str++; *(end - 1) == '0'; end--); // jump over zeros at the end
if (str == end) // number was something like '123.000' 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; char *endpos= (char*) str;
int error; int error;
info->ullval= (ulonglong) my_strtoll10(begin, &endpos, &error); info->ullval= (ulonglong) my_strtoll10(begin, &endpos, &error);
return 1; DBUG_RETURN(1);
} }
for (; str != end && my_isdigit(system_charset_info,*str); str++) for (; str != end && my_isdigit(system_charset_info,*str); str++)
info->decimals++; info->decimals++;
if (str == end) if (str == end)
{ {
info->dval = my_atof(begin); info->dval = my_atof(begin);
return 1; DBUG_RETURN(1);
} }
} }
return 0; DBUG_RETURN(0);
} }