mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Some code improvements
This commit is contained in:
@ -85,7 +85,7 @@ mysqld_show_dbs(THD *thd,const char *wild)
|
||||
{
|
||||
packet->length(0);
|
||||
net_store_data(packet, thd->variables.convert_set, file_name);
|
||||
if (SEND_ROW(thd, &thd->net, field_list.elements,
|
||||
if (SEND_ROW(thd, field_list.elements,
|
||||
(char *)packet->ptr(), packet->length()))
|
||||
DBUG_RETURN(-1);
|
||||
}
|
||||
@ -125,7 +125,7 @@ int mysqld_show_open_tables(THD *thd,const char *wild)
|
||||
net_store_data(packet,convert, open_list->table);
|
||||
net_store_data(packet,open_list->in_use);
|
||||
net_store_data(packet,open_list->locked);
|
||||
if (SEND_ROW(thd, &thd->net, field_list.elements,
|
||||
if (SEND_ROW(thd, field_list.elements,
|
||||
(char *)packet->ptr(), packet->length()))
|
||||
{
|
||||
DBUG_RETURN(-1);
|
||||
@ -168,7 +168,7 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild)
|
||||
{
|
||||
packet->length(0);
|
||||
net_store_data(packet, thd->variables.convert_set, file_name);
|
||||
if (SEND_ROW(thd, &thd->net, field_list.elements,
|
||||
if (SEND_ROW(thd, field_list.elements,
|
||||
(char *)packet->ptr(), packet->length()))
|
||||
DBUG_RETURN(-1);
|
||||
}
|
||||
@ -635,7 +635,7 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
|
||||
}
|
||||
close_thread_tables(thd,0);
|
||||
}
|
||||
if (SEND_ROW(thd, &thd->net, field_list.elements,
|
||||
if (SEND_ROW(thd, field_list.elements,
|
||||
(char *)packet->ptr(), packet->length()))
|
||||
DBUG_RETURN(-1);
|
||||
}
|
||||
@ -762,7 +762,7 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild,
|
||||
net_store_data(packet,convert, tmp+1,end == tmp ? 0 : (uint) (end-tmp-1));
|
||||
net_store_data(packet, field->comment.str,field->comment.length);
|
||||
}
|
||||
if (SEND_ROW(thd, &thd->net, field_list.elements,
|
||||
if (SEND_ROW(thd, field_list.elements,
|
||||
(char *)packet->ptr(), packet->length()))
|
||||
DBUG_RETURN(-1);
|
||||
}
|
||||
@ -833,7 +833,7 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
|
||||
int3store(p, create_len);
|
||||
|
||||
// now we are in business :-)
|
||||
if (SEND_ROW(thd, &thd->net, field_list.elements,
|
||||
if (SEND_ROW(thd, field_list.elements,
|
||||
(char *)packet->ptr(), packet->length()))
|
||||
DBUG_RETURN(-1);
|
||||
}
|
||||
@ -957,7 +957,7 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list)
|
||||
net_store_data(packet,convert,table->file->index_type(i));
|
||||
/* Comment */
|
||||
net_store_data(packet,convert,"");
|
||||
if (SEND_ROW(thd, &thd->net, field_list.elements,
|
||||
if (SEND_ROW(thd, field_list.elements,
|
||||
(char *)packet->ptr(), packet->length()))
|
||||
DBUG_RETURN(-1);
|
||||
}
|
||||
@ -1386,7 +1386,7 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
|
||||
net_store_data(packet,convert,thd_info->query);
|
||||
else
|
||||
net_store_null(packet);
|
||||
if (SEND_ROW(thd, &thd->net, field_list.elements,
|
||||
if (SEND_ROW(thd, field_list.elements,
|
||||
(char *)packet->ptr(), packet->length()))
|
||||
break;
|
||||
}
|
||||
@ -1687,7 +1687,7 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables,
|
||||
net_store_data(&packet2, ""); // Safety
|
||||
break;
|
||||
}
|
||||
if (SEND_ROW(thd, &thd->net, field_list.elements,
|
||||
if (SEND_ROW(thd, field_list.elements,
|
||||
(char *)packet2.ptr(), packet2.length()))
|
||||
goto err;
|
||||
}
|
||||
|
Reference in New Issue
Block a user