Skip to content

Commit 0303cd5

Browse files
author
monty@narttu.mysql.fi
committed
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2 parents 7a54334 + 27cbc50 commit 0303cd5

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

sql/sql_help.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -553,14 +553,14 @@ int send_variant_2_list(MEM_ROOT *mem_root, Protocol *protocol,
553553

554554
String **pointers= (String**)alloc_root(mem_root,
555555
sizeof(String*)*names->elements);
556-
String **pos= pointers;
556+
String **pos;
557+
String **end= pointers + names->elements;
557558

558559
List_iterator<String> it(*names);
559-
while ((*pos++= it++));
560+
for ( pos= pointers; pos!=end; (*pos++= it++));
560561

561562
qsort(pointers,names->elements,sizeof(String*),string_ptr_cmp);
562563

563-
String **end= pointers + names->elements;
564564
for (pos= pointers; pos!=end; pos++)
565565
{
566566
protocol->prepare_for_resend();

0 commit comments

Comments
 (0)