database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1

Browse Source 
into genie.(none):/home/hf/work/mysql-4.1
This commit is contained in:
hf@genie.(none)
2002-10-18 15:55:21 +05:00
parent f3d3d2882d 2be6f27219
commit 8a88791fb1
24 changed files with 775 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
sql/sql_show.cc
View File

@ -52,8 +52,6 @@ extern struct st_VioSSLAcceptorFd * ssl_acceptor_fd;
** Send list of databases
** A database is a directory in the mysql_data_home directory
****************************************************************************/
int
mysqld_show_dbs(THD *thd,const char *wild)
{
@ -87,8 +85,8 @@ mysqld_show_dbs(THD *thd,const char *wild)
{
packet->length(0);
net_store_data(packet, thd->variables.convert_set, file_name);
if (my_net_write(&thd->net, (char*) packet->ptr(),
packet->length()))
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)packet->ptr(), packet->length()))
DBUG_RETURN(-1);
}
}
@ -127,7 +125,8 @@ 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 (my_net_write(&thd->net,(char*) packet->ptr(),packet->length()))
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)packet->ptr(), packet->length()))
{
DBUG_RETURN(-1);
}
@ -169,7 +168,8 @@ 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 (my_net_write(&thd->net,(char*) packet->ptr(),packet->length()))
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)packet->ptr(), packet->length()))
DBUG_RETURN(-1);
}
send_eof(thd);
@ -635,9 +635,9 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
}
close_thread_tables(thd,0);
}
if (my_net_write(&thd->net,(char*) packet->ptr(),
packet->length()))
DBUG_RETURN(-1);
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)packet->ptr(), packet->length()))
DBUG_RETURN(-1);
}
send_eof(thd);
DBUG_RETURN(0);
@ -647,7 +647,6 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
/***************************************************************************
** List all columns in a table_list->real_name
***************************************************************************/
int
mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild,
bool verbose)
@ -750,8 +749,8 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild,
if (verbose)
{
/* Add grant options & comments */
col_access= get_column_grant(thd,table_list,field) & COL_ACLS;
end=tmp;
col_access= get_column_grant(thd,table_list,field) & COL_ACLS;
for (uint bitnr=0; col_access ; col_access>>=1,bitnr++)
{
if (col_access & 1)
@ -763,8 +762,9 @@ 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 (my_net_write(&thd->net,(char*) packet->ptr(),packet->length()))
DBUG_RETURN(1);
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)packet->ptr(), packet->length()))
DBUG_RETURN(-1);
}
}
}
@ -833,8 +833,9 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
int3store(p, create_len);
// now we are in business :-)
if (my_net_write(&thd->net, (char*)packet->ptr(), packet->length()))
DBUG_RETURN(1);
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)packet->ptr(), packet->length()))
DBUG_RETURN(-1);
}
send_eof(thd);
DBUG_RETURN(0);
@ -956,8 +957,9 @@ 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 (my_net_write(&thd->net,(char*) packet->ptr(),packet->length()))
DBUG_RETURN(1); /* purecov: inspected */
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)packet->ptr(), packet->length()))
DBUG_RETURN(-1);
}
}
send_eof(thd);
@ -1384,8 +1386,9 @@ 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 (my_net_write(&thd->net,(char*) packet->ptr(),packet->length()))
break; /* purecov: inspected */
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)packet->ptr(), packet->length()))
break;
}
send_eof(thd);
DBUG_VOID_RETURN;
@ -1684,8 +1687,9 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables,
net_store_data(&packet2, ""); // Safety
break;
}
if (my_net_write(&thd->net, (char*) packet2.ptr(),packet2.length()))
goto err; /* purecov: inspected */
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)packet2.ptr(), packet2.length()))
goto err;
}
}
pthread_mutex_unlock(&LOCK_status);