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

Merge 5.5 -> 10.0-base

Browse Source
This commit is contained in:
Alexander Barkov 2013-11-09 00:16:42 +04:00
commit 8f0be1ad7c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_show.cc
View File

@ -2853,19 +2853,20 @@ void remove_status_vars(SHOW_VAR *list)
for (; list->name; list++) for (; list->name; list++)
{ {
int res= 0, a= 0, b= all_status_vars.elements, c= (a+b)/2; int first= 0, last= ((int) all_status_vars.elements) - 1;
for (; b-a > 0; c= (a+b)/2) for ( ; first <= last; )
{ {
res= show_var_cmp(list, all+c); int res, middle= (first + last) / 2;
if (res < 0) if ((res= show_var_cmp(list, all + middle)) < 0)
b= c; last= middle - 1;
else if (res > 0) else if (res > 0)
a= c; first= middle + 1;
else else
{
all[middle].type= SHOW_UNDEF;
break; break;
}
} }
if (res == 0)
all[c].type= SHOW_UNDEF;
} }
shrink_var_array(&all_status_vars); shrink_var_array(&all_status_vars);
mysql_mutex_unlock(&LOCK_status); mysql_mutex_unlock(&LOCK_status);