Commit 4e6acef8 authored by unknown's avatar unknown

Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/NEW_HELP/4.1.clear

parents 7953039d c284a712
......@@ -557,7 +557,7 @@ int send_variant_2_list(MEM_ROOT *mem_root, Protocol *protocol,
List_iterator<String> it(*names);
String *cur_name;
while (*pos++= it++);
while ((*pos++= it++));
qsort(pointers,names->elements,sizeof(String*),string_ptr_cmp);
......@@ -689,7 +689,7 @@ int mysqld_help(THD *thd, const char *mask)
goto end;
}
for (int i=0; i<sizeof(tables)/sizeof(TABLE_LIST); i++)
for (size_t i=0; i<sizeof(tables)/sizeof(TABLE_LIST); i++)
tables[i].table->file->init_table_handle_for_HANDLER();
if (!(select_topics_by_name=
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment