Skip to content

M
MariaDB
Commit 253c6419 authored by hf@bisonxp.(none)'s avatar hf@bisonxp.(none)
Browse files
Options

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

into bisonxp.(none):/home/hf/work/mysql-4.1
parents 0c481e7b 7813e480
Expand all Show whitespace changes
Inline Side-by-side
Showing with 668 additions and 317 deletions
BitKeeper/etc/logging_ok
View file @ 253c6419
...@@ -3,16 +3,20 @@ Administrator@co3064164-a.rochd1.qld.optushome.com.au ...@@ -3,16 +3,20 @@ Administrator@co3064164-a.rochd1.qld.optushome.com.au
Administrator@fred. Administrator@fred.
Miguel@light.local Miguel@light.local
Sinisa@sinisa.nasamreza.org Sinisa@sinisa.nasamreza.org
WAX@sergbook.mysql.com
ahlentz@co3064164-a.rochd1.qld.optusnet.com.au ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
akishkin@work.mysql.com akishkin@work.mysql.com
arjen@co3064164-a.bitbike.com arjen@co3064164-a.bitbike.com
arjen@fred.bitbike.com arjen@fred.bitbike.com
arjen@george.bitbike.com arjen@george.bitbike.com
bar@bar.udmsearch.izhnet.ru
bar@gw.udmsearch.izhnet.ru bar@gw.udmsearch.izhnet.ru
bell@sanja.is.com.ua bell@sanja.is.com.ua
davida@isil.mysql.com davida@isil.mysql.com
heikki@donna.mysql.fi heikki@donna.mysql.fi
heikki@hundin.mysql.fi heikki@hundin.mysql.fi
hf@bison.(none)
hf@bisonxp.(none)
jani@dsl-jkl1657.dial.inet.fi jani@dsl-jkl1657.dial.inet.fi
jani@hynda.(none) jani@hynda.(none)
jani@hynda.mysql.fi jani@hynda.mysql.fi
...@@ -41,10 +45,12 @@ monty@tramp.mysql.fi ...@@ -41,10 +45,12 @@ monty@tramp.mysql.fi
monty@work.mysql.com monty@work.mysql.com
mwagner@cash.mwagner.org mwagner@cash.mwagner.org
mwagner@evoq.mwagner.org mwagner@evoq.mwagner.org
nick@mysql.com
nick@nick.leippe.com nick@nick.leippe.com
paul@central.snake.net paul@central.snake.net
paul@teton.kitebird.com paul@teton.kitebird.com
ram@gw.udmsearch.izhnet.ru ram@gw.udmsearch.izhnet.ru
ram@ram.(none)
root@x3.internalnet root@x3.internalnet
sasha@mysql.sashanet.com sasha@mysql.sashanet.com
serg@serg.mysql.com serg@serg.mysql.com
...@@ -63,13 +69,9 @@ tonu@hundin.mysql.fi ...@@ -63,13 +69,9 @@ tonu@hundin.mysql.fi
tonu@volk.internalnet tonu@volk.internalnet
tonu@x153.internalnet tonu@x153.internalnet
tonu@x3.internalnet tonu@x3.internalnet
venu@myvenu.com
venu@work.mysql.com venu@work.mysql.com
walrus@mysql.com
worm@altair.is.lan worm@altair.is.lan
zak@balfor.local zak@balfor.local
zak@linux.local zak@linux.local
venu@myvenu.com
walrus@mysql.com
ram@ram.(none)
WAX@sergbook.mysql.com
bar@bar.udmsearch.izhnet.ru
nick@mysql.com
include/mysql.h
View file @ 253c6419
...@@ -125,6 +125,9 @@ typedef struct st_mysql_data { ...@@ -125,6 +125,9 @@ typedef struct st_mysql_data {
unsigned int fields; unsigned int fields;
MYSQL_ROWS *data; MYSQL_ROWS *data;
MEM_ROOT alloc; MEM_ROOT alloc;
#ifdef EMBEDDED_LIBRARY
MYSQL_ROWS **prev_ptr;
#endif
} MYSQL_DATA; } MYSQL_DATA;
struct st_mysql_options { struct st_mysql_options {
...@@ -154,13 +157,20 @@ struct st_mysql_options { ...@@ -154,13 +157,20 @@ struct st_mysql_options {
a read that is replication-aware a read that is replication-aware
*/ */
my_bool no_master_reads; my_bool no_master_reads;
#ifdef EMBEDDED_LIBRARY
my_bool separate_thread;
#endif
}; };
enum mysql_option { MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS, enum mysql_option { MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS,
MYSQL_OPT_NAMED_PIPE, MYSQL_INIT_COMMAND, MYSQL_OPT_NAMED_PIPE, MYSQL_INIT_COMMAND,
MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP, MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP,
MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME, MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME,
MYSQL_OPT_LOCAL_INFILE}; MYSQL_OPT_LOCAL_INFILE,
#ifdef EMBEDDED_LIBRARY
MYSQL_OPT_USE_RESULT
#endif
};
enum mysql_status { MYSQL_STATUS_READY,MYSQL_STATUS_GET_RESULT, enum mysql_status { MYSQL_STATUS_READY,MYSQL_STATUS_GET_RESULT,
MYSQL_STATUS_USE_RESULT}; MYSQL_STATUS_USE_RESULT};
...@@ -173,12 +183,18 @@ enum mysql_status { MYSQL_STATUS_READY,MYSQL_STATUS_GET_RESULT, ...@@ -173,12 +183,18 @@ enum mysql_status { MYSQL_STATUS_READY,MYSQL_STATUS_GET_RESULT,
enum mysql_rpl_type { MYSQL_RPL_MASTER, MYSQL_RPL_SLAVE, enum mysql_rpl_type { MYSQL_RPL_MASTER, MYSQL_RPL_SLAVE,
MYSQL_RPL_ADMIN }; MYSQL_RPL_ADMIN };
struct st_mysql_res;
typedef struct st_mysql { typedef struct st_mysql {
NET net; /* Communication parameters */ NET net; /* Communication parameters */
gptr connector_fd; /* ConnectorFd for SSL */ gptr connector_fd; /* ConnectorFd for SSL */
char *host,*user,*passwd,*unix_socket,*server_version,*host_info, #ifndef _0EMBEDDED_LIBRARY
*info,*db; char *host,*user,*passwd,*unix_socket,*server_version,*host_info,*info;
#endif
#ifdef EMBEDDED_LIBRARY
struct st_mysql_res *result;
#endif
char *db;
struct charset_info_st *charset; struct charset_info_st *charset;
MYSQL_FIELD *fields; MYSQL_FIELD *fields;
MEM_ROOT field_alloc; MEM_ROOT field_alloc;
...@@ -214,6 +230,9 @@ typedef struct st_mysql { ...@@ -214,6 +230,9 @@ typedef struct st_mysql {
typedef struct st_mysql_res { typedef struct st_mysql_res {
#ifdef EMBEDDED_LIBRARY
const char *query_str;
#endif
my_ulonglong row_count; my_ulonglong row_count;
MYSQL_FIELD *fields; MYSQL_FIELD *fields;
MYSQL_DATA *data; MYSQL_DATA *data;
......
include/violite.h
View file @ 253c6419
...@@ -31,8 +31,13 @@ ...@@ -31,8 +31,13 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
enum enum_vio_type { VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET, enum enum_vio_type {
VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL}; VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET,
VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL
#ifdef EMBEDDED_LIBRARY
,VIO_SHARED_MEMORY, VIO_BUFFER
#endif
};
#ifndef __WIN__ #ifndef __WIN__
#define HANDLE void * #define HANDLE void *
......
libmysqld/embedded_priv.h
View file @ 253c6419
...@@ -29,4 +29,7 @@ extern void end_embedded_connection(NET * net); ...@@ -29,4 +29,7 @@ extern void end_embedded_connection(NET * net);
extern void lib_connection_phase(NET *net, int phase); extern void lib_connection_phase(NET *net, int phase);
extern bool lib_dispatch_command(enum enum_server_command command, NET *net, extern bool lib_dispatch_command(enum enum_server_command command, NET *net,
const char *arg, ulong length); const char *arg, ulong length);
extern void init_embedded_mysql(MYSQL *mysql, int client_flag, char *db);
extern void *create_embedded_thd(Vio *vio, unsigned char *buff, int client_flag, char *db);
extern NET *get_mysql_net(MYSQL *mysql);
C_MODE_END C_MODE_END
libmysqld/lib_sql.cc
View file @ 253c6419
This diff is collapsed.
libmysqld/lib_vio.c
View file @ 253c6419
...@@ -42,14 +42,7 @@ ...@@ -42,14 +42,7 @@
struct st_vio struct st_vio
{ {
my_socket sd; /* my_socket - real or imaginary */
HANDLE hPipe;
my_bool localhost; /* Are we from localhost? */
int fcntl_mode; /* Buffered fcntl(sd,F_GETFL) */
struct sockaddr_in local; /* Local internet address */
struct sockaddr_in remote; /* Remote internet address */
enum enum_vio_type type; /* Type of connection */ enum enum_vio_type type; /* Type of connection */
char desc[30]; /* String description */
void *dest_thd; void *dest_thd;
char *packets, **last_packet; char *packets, **last_packet;
char *where_in_packet, *end_of_packet; char *where_in_packet, *end_of_packet;
...@@ -57,6 +50,7 @@ struct st_vio ...@@ -57,6 +50,7 @@ struct st_vio
MEM_ROOT root; MEM_ROOT root;
}; };
/* Initialize the communication buffer */ /* Initialize the communication buffer */
Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost) Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost)
...@@ -69,6 +63,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost) ...@@ -69,6 +63,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost)
init_alloc_root(&vio->root, 8192, 8192); init_alloc_root(&vio->root, 8192, 8192);
vio->root.min_malloc = sizeof(char *) + 4; vio->root.min_malloc = sizeof(char *) + 4;
vio->last_packet = &vio->packets; vio->last_packet = &vio->packets;
vio->type = type;
} }
DBUG_RETURN(vio); DBUG_RETURN(vio);
} }
...@@ -219,4 +214,22 @@ my_bool vio_poll_read(Vio *vio,uint timeout) ...@@ -219,4 +214,22 @@ my_bool vio_poll_read(Vio *vio,uint timeout)
return 0; return 0;
} }
int create_vio(NET *net, int separate_thread)
{
Vio * v = net->vio;
if (!v)
{
v = vio_new(0, separate_thread ? VIO_SHARED_MEMORY : VIO_BUFFER, 0);
net->vio = v;
}
return !v;
}
void set_thd(Vio *v, void *thd)
{
if (v)
{
v -> dest_thd = thd;
}
}
#endif /* HAVE_VIO */ #endif /* HAVE_VIO */
libmysqld/libmysqld.c
View file @ 253c6419
This diff is collapsed.
sql/ha_myisam.cc
View file @ 253c6419
...@@ -80,7 +80,7 @@ static void mi_check_print_msg(MI_CHECK *param, const char* msg_type, ...@@ -80,7 +80,7 @@ static void mi_check_print_msg(MI_CHECK *param, const char* msg_type,
net_store_data(packet, msg_type); net_store_data(packet, msg_type);
net_store_data(packet, msgbuf); net_store_data(packet, msgbuf);
if (my_net_write(&thd->net, (char*)thd->packet.ptr(), thd->packet.length())) if (SEND_ROW(thd, &thd->net, 4, (char*)thd->packet.ptr(), thd->packet.length()))
sql_print_error("Failed on my_net_write, writing to stderr instead: %s\n", sql_print_error("Failed on my_net_write, writing to stderr instead: %s\n",
msgbuf); msgbuf);
return; return;
......
sql/item.cc
View file @ 253c6419
...@@ -469,6 +469,9 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) ...@@ -469,6 +469,9 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
cause error ER_NON_UNIQ_ERROR in find_field_in_tables. cause error ER_NON_UNIQ_ERROR in find_field_in_tables.
*/ */
SELECT_LEX *last= 0; SELECT_LEX *last= 0;
#ifdef EMBEDDED_LIBRARY
thd->net.last_errno= 0;
#endif
for (SELECT_LEX *sl= thd->lex.select->outer_select(); for (SELECT_LEX *sl= thd->lex.select->outer_select();
sl && !tmp; sl && !tmp;
sl= sl->outer_select()) sl= sl->outer_select())
......
sql/item_strfunc.cc
View file @ 253c6419
...@@ -1248,10 +1248,15 @@ String *Item_func_database::val_str(String *str) ...@@ -1248,10 +1248,15 @@ String *Item_func_database::val_str(String *str)
String *Item_func_user::val_str(String *str) String *Item_func_user::val_str(String *str)
{ {
THD *thd=current_thd; THD *thd=current_thd;
#ifdef EMBEDDED_LIBRARY
if (str->copy("localuser@localhost", (uint)strlen("localuser@localhost")))
return &empty_string;
#else
if (str->copy((const char*) thd->user,(uint) strlen(thd->user)) || if (str->copy((const char*) thd->user,(uint) strlen(thd->user)) ||
str->append('@') || str->append('@') ||
str->append(thd->host ? thd->host : thd->ip ? thd->ip : "")) str->append(thd->host ? thd->host : thd->ip ? thd->ip : ""))
return &empty_string; return &empty_string;
#endif
return str; return str;
} }
......
sql/mysql_priv.h
View file @ 253c6419
...@@ -825,4 +825,13 @@ inline void mark_as_null_row(TABLE *table) ...@@ -825,4 +825,13 @@ inline void mark_as_null_row(TABLE *table)
bfill(table->null_flags,table->null_bytes,255); bfill(table->null_flags,table->null_bytes,255);
} }
#ifdef EMBEDDED_LIBRARY
int embedded_send_row(THD *thd, int n_fields, char *data, int data_len);
#define SEND_ROW(thd, net, n_fields, data, data_len)\
embedded_send_row(thd, n_fields, data, data_len)
#else
#define SEND_ROW(thd, net, n_fields, data, data_len)\
my_net_write(net, data, data_len)
#endif
#endif #endif
sql/net_pkg.cc
View file @ 253c6419
...@@ -48,6 +48,11 @@ void send_error(NET *net, uint sql_errno, const char *err) ...@@ -48,6 +48,11 @@ void send_error(NET *net, uint sql_errno, const char *err)
} }
} }
} }
#ifdef EMBEDDED_LIBRARY
net->last_errno= sql_errno;
strmake(net->last_error, err, sizeof(net->last_error)-1);
#else
push_error(sql_errno, err); push_error(sql_errno, err);
if (net->vio == 0) if (net->vio == 0)
{ {
...@@ -71,6 +76,7 @@ void send_error(NET *net, uint sql_errno, const char *err) ...@@ -71,6 +76,7 @@ void send_error(NET *net, uint sql_errno, const char *err)
set_if_smaller(length,MYSQL_ERRMSG_SIZE); set_if_smaller(length,MYSQL_ERRMSG_SIZE);
} }
VOID(net_write_command(net,(uchar) 255,(char*) err,length)); VOID(net_write_command(net,(uchar) 255,(char*) err,length));
#endif /* EMBEDDED_LIBRARY*/
if (thd) if (thd)
thd->fatal_error=0; // Error message is given thd->fatal_error=0; // Error message is given
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
...@@ -131,6 +137,7 @@ net_printf(NET *net, uint errcode, ...) ...@@ -131,6 +137,7 @@ net_printf(NET *net, uint errcode, ...)
length=sizeof(net->last_error)-1; /* purecov: inspected */ length=sizeof(net->last_error)-1; /* purecov: inspected */
va_end(args); va_end(args);
#ifndef EMBEDDED_LIBRARY
push_error(errcode, text_pos); push_error(errcode, text_pos);
if (net->vio == 0) if (net->vio == 0)
{ {
...@@ -149,11 +156,16 @@ net_printf(NET *net, uint errcode, ...) ...@@ -149,11 +156,16 @@ net_printf(NET *net, uint errcode, ...)
if (offset) if (offset)
int2store(text_pos-2, errcode); int2store(text_pos-2, errcode);
VOID(net_real_write(net,(char*) net->buff,length+head_length+1+offset)); VOID(net_real_write(net,(char*) net->buff,length+head_length+1+offset));
#else
net->last_errno= errcode;
strmake(net->last_error, text_pos, length);
#endif
if (thd) if (thd)
thd->fatal_error=0; // Error message is given thd->fatal_error=0; // Error message is given
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
#ifndef EMBEDDED_LIBRARY
void void
send_ok(NET *net,ha_rows affected_rows,ulonglong id,const char *message) send_ok(NET *net,ha_rows affected_rows,ulonglong id,const char *message)
...@@ -181,6 +193,8 @@ send_ok(NET *net,ha_rows affected_rows,ulonglong id,const char *message) ...@@ -181,6 +193,8 @@ send_ok(NET *net,ha_rows affected_rows,ulonglong id,const char *message)
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
#endif /* EMBEDDED_LIBRARY */
void void
send_eof(NET *net,bool no_flush) send_eof(NET *net,bool no_flush)
{ {
......
sql/sql_acl.cc
View file @ 253c6419
...@@ -2553,8 +2553,12 @@ uint get_table_grant(THD *thd, TABLE_LIST *table) ...@@ -2553,8 +2553,12 @@ uint get_table_grant(THD *thd, TABLE_LIST *table)
GRANT_TABLE *grant_table; GRANT_TABLE *grant_table;
pthread_mutex_lock(&LOCK_grant); pthread_mutex_lock(&LOCK_grant);
#ifdef EMBEDDED_LIBRARY
grant_table= NULL;
#else
grant_table = table_hash_search(thd->host,thd->ip,db,user, grant_table = table_hash_search(thd->host,thd->ip,db,user,
table->real_name,0); table->real_name,0);
#endif
table->grant.grant_table=grant_table; // Remember for column test table->grant.grant_table=grant_table; // Remember for column test
table->grant.version=grant_version; table->grant.version=grant_version;
if (grant_table) if (grant_table)
......
sql/sql_base.cc
View file @ 253c6419
...@@ -179,6 +179,7 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild) ...@@ -179,6 +179,7 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild)
DBUG_RETURN(open_list); DBUG_RETURN(open_list);
} }
#ifndef EMBEDDED_LIBRARY
/* /*
Send name and type of result to client. Send name and type of result to client.
Sum fields has table name empty and field_name. Sum fields has table name empty and field_name.
...@@ -383,6 +384,7 @@ send_fields(THD *thd,List<Item> &list,uint flag) ...@@ -383,6 +384,7 @@ send_fields(THD *thd,List<Item> &list,uint flag)
return 1; /* purecov: inspected */ return 1; /* purecov: inspected */
} }
#endif /* EMBEDDED_LIBRARY */
/***************************************************************************** /*****************************************************************************
* Functions to free open table cache * Functions to free open table cache
......
sql/sql_class.cc
View file @ 253c6419
...@@ -387,6 +387,8 @@ bool select_send::send_fields(List<Item> &list,uint flag) ...@@ -387,6 +387,8 @@ bool select_send::send_fields(List<Item> &list,uint flag)
} }
#ifndef EMBEDDED_LIBRARY
/* Send data to client. Returns 0 if ok */ /* Send data to client. Returns 0 if ok */
bool select_send::send_data(List<Item> &items) bool select_send::send_data(List<Item> &items)
...@@ -415,6 +417,7 @@ bool select_send::send_data(List<Item> &items) ...@@ -415,6 +417,7 @@ bool select_send::send_data(List<Item> &items)
bool error=my_net_write(&thd->net,(char*) packet->ptr(),packet->length()); bool error=my_net_write(&thd->net,(char*) packet->ptr(),packet->length());
DBUG_RETURN(error); DBUG_RETURN(error);
} }
#endif /* EMBEDDED_LIBRARY */
bool select_send::send_eof() bool select_send::send_eof()
{ {
......
sql/sql_class.h
View file @ 253c6419
...@@ -319,6 +319,10 @@ class delayed_insert; ...@@ -319,6 +319,10 @@ class delayed_insert;
#define THD_SENTRY_MAGIC 0xfeedd1ff #define THD_SENTRY_MAGIC 0xfeedd1ff
#define THD_SENTRY_GONE 0xdeadbeef #define THD_SENTRY_GONE 0xdeadbeef
#ifdef EMBEDDED_LIBRARY
typedef struct st_mysql;
#endif
#define THD_CHECK_SENTRY(thd) DBUG_ASSERT(thd->dbug_sentry == THD_SENTRY_MAGIC) #define THD_CHECK_SENTRY(thd) DBUG_ASSERT(thd->dbug_sentry == THD_SENTRY_MAGIC)
/* /*
...@@ -330,12 +334,15 @@ class THD :public ilink { ...@@ -330,12 +334,15 @@ class THD :public ilink {
public: public:
NET net; // client connection descriptor NET net; // client connection descriptor
LEX lex; // parse tree descriptor LEX lex; // parse tree descriptor
MEM_ROOT mem_root; // 1 command-life memory MEM_ROOT mem_root; // 1 command-life memory allocation pool
MEM_ROOT con_root; // connection-life memory
HASH user_vars; // hash for user variables HASH user_vars; // hash for user variables
String packet; // buffer used for network I/O String packet; // dynamic string buffer used for network I/O
struct sockaddr_in remote; // client socket address struct sockaddr_in remote; // client socket address
struct rand_struct rand; // used for authentication struct rand_struct rand; // used for authentication
#ifdef EMBEDDED_LIBRARY
struct st_mysql *mysql;
#endif
MEM_ROOT con_root; // connection-life memory
/* /*
Query points to the current query, Query points to the current query,
......
sql/sql_handler.cc
View file @ 253c6419
...@@ -232,7 +232,7 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables, ...@@ -232,7 +232,7 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
goto err; goto err;
} }
} }
my_net_write(&thd->net, (char*)packet->ptr(), packet->length()); SEND_ROW(thd, &thd->net, list.elements, (char*)packet->ptr(), packet->length());
} }
} }
num_rows++; num_rows++;
......
sql/sql_parse.cc
View file @ 253c6419
...@@ -825,8 +825,9 @@ int mysql_table_dump(THD* thd, char* db, char* tbl_name, int fd) ...@@ -825,8 +825,9 @@ int mysql_table_dump(THD* thd, char* db, char* tbl_name, int fd)
} }
/* Execute one command from socket (query or simple command) */ #ifndef EMBEDDED_LIBRARY
/* Execute one command from socket (query or simple command) */
bool do_command(THD *thd) bool do_command(THD *thd)
{ {
char *packet; char *packet;
...@@ -864,6 +865,7 @@ bool do_command(THD *thd) ...@@ -864,6 +865,7 @@ bool do_command(THD *thd)
DBUG_RETURN(dispatch_command(command,thd, packet+1, (uint) packet_length)); DBUG_RETURN(dispatch_command(command,thd, packet+1, (uint) packet_length));
} }
#endif /* EMBEDDED_LIBRARY */
bool dispatch_command(enum enum_server_command command, THD *thd, bool dispatch_command(enum enum_server_command command, THD *thd,
char* packet, uint packet_length) char* packet, uint packet_length)
......
sql/sql_select.cc
View file @ 253c6419
...@@ -5249,6 +5249,9 @@ end_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), ...@@ -5249,6 +5249,9 @@ end_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
{ {
Item *item= *group->item; Item *item= *group->item;
item->save_org_in_field(group->field); item->save_org_in_field(group->field);
#ifdef EMBEDDED_LIBRARY
join->thd->net.last_errno= 0;
#endif
/* Store in the used key if the field was 0 */ /* Store in the used key if the field was 0 */
if (item->maybe_null) if (item->maybe_null)
group->buff[-1]=item->null_value ? 1 : 0; group->buff[-1]=item->null_value ? 1 : 0;
...@@ -7337,6 +7340,6 @@ static void describe_info(THD *thd, const char *info) ...@@ -7337,6 +7340,6 @@ static void describe_info(THD *thd, const char *info)
return; /* purecov: inspected */ return; /* purecov: inspected */
packet->length(0); packet->length(0);
net_store_data(packet,info); net_store_data(packet,info);
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()))
send_eof(&thd->net); send_eof(&thd->net);
} }
sql/sql_show.cc
View file @ 253c6419
...@@ -52,8 +52,6 @@ extern struct st_VioSSLAcceptorFd * ssl_acceptor_fd; ...@@ -52,8 +52,6 @@ extern struct st_VioSSLAcceptorFd * ssl_acceptor_fd;
** Send list of databases ** Send list of databases
** A database is a directory in the mysql_data_home directory ** A database is a directory in the mysql_data_home directory
****************************************************************************/ ****************************************************************************/
int int
mysqld_show_dbs(THD *thd,const char *wild) mysqld_show_dbs(THD *thd,const char *wild)
{ {
...@@ -85,8 +83,8 @@ mysqld_show_dbs(THD *thd,const char *wild) ...@@ -85,8 +83,8 @@ mysqld_show_dbs(THD *thd,const char *wild)
{ {
thd->packet.length(0); thd->packet.length(0);
net_store_data(&thd->packet, thd->convert_set, file_name); net_store_data(&thd->packet, thd->convert_set, file_name);
if (my_net_write(&thd->net, (char*) thd->packet.ptr(), if (SEND_ROW(thd, &thd->net, field_list.elements,
thd->packet.length())) (char *)thd->packet.ptr(), thd->packet.length()))
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
} }
...@@ -123,7 +121,8 @@ int mysqld_show_open_tables(THD *thd,const char *wild) ...@@ -123,7 +121,8 @@ int mysqld_show_open_tables(THD *thd,const char *wild)
net_store_data(&thd->packet,convert, open_list->table); net_store_data(&thd->packet,convert, open_list->table);
net_store_data(&thd->packet,open_list->in_use); net_store_data(&thd->packet,open_list->in_use);
net_store_data(&thd->packet,open_list->locked); net_store_data(&thd->packet,open_list->locked);
if (my_net_write(&thd->net,(char*) thd->packet.ptr(),thd->packet.length())) if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)thd->packet.ptr(), thd->packet.length()))
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
...@@ -162,7 +161,8 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild) ...@@ -162,7 +161,8 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild)
{ {
thd->packet.length(0); thd->packet.length(0);
net_store_data(&thd->packet, thd->convert_set, file_name); net_store_data(&thd->packet, thd->convert_set, file_name);
if (my_net_write(&thd->net,(char*) thd->packet.ptr(),thd->packet.length())) if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)thd->packet.ptr(), thd->packet.length()))
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
send_eof(&thd->net); send_eof(&thd->net);
...@@ -606,8 +606,8 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild) ...@@ -606,8 +606,8 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
} }
close_thread_tables(thd,0); close_thread_tables(thd,0);
} }
if (my_net_write(&thd->net,(char*) packet->ptr(), if (SEND_ROW(thd, &thd->net, field_list.elements,
packet->length())) (char *)thd->packet.ptr(), thd->packet.length()))
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
send_eof(&thd->net); send_eof(&thd->net);
...@@ -619,7 +619,6 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild) ...@@ -619,7 +619,6 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
/*************************************************************************** /***************************************************************************
** List all columns in a table ** List all columns in a table
***************************************************************************/ ***************************************************************************/
int int
mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild, mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild,
bool verbose) bool verbose)
...@@ -722,8 +721,8 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild, ...@@ -722,8 +721,8 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild,
if (verbose) if (verbose)
{ {
/* Add grant options & comments */ /* Add grant options & comments */
col_access= get_column_grant(thd,table_list,field) & COL_ACLS;
end=tmp; end=tmp;
col_access= get_column_grant(thd,table_list,field) & COL_ACLS;
for (uint bitnr=0; col_access ; col_access>>=1,bitnr++) for (uint bitnr=0; col_access ; col_access>>=1,bitnr++)
{ {
if (col_access & 1) if (col_access & 1)
...@@ -735,8 +734,9 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild, ...@@ -735,8 +734,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,convert, tmp+1,end == tmp ? 0 : (uint) (end-tmp-1));
net_store_data(packet, field->comment.str,field->comment.length); net_store_data(packet, field->comment.str,field->comment.length);
} }
if (my_net_write(&thd->net,(char*) packet->ptr(),packet->length())) if (SEND_ROW(thd, &thd->net, field_list.elements,
DBUG_RETURN(1); (char *)thd->packet.ptr(), thd->packet.length()))
DBUG_RETURN(-1);
} }
} }
} }
...@@ -804,8 +804,9 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list) ...@@ -804,8 +804,9 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
int3store(p, create_len); int3store(p, create_len);
// now we are in business :-) // now we are in business :-)
if (my_net_write(&thd->net, (char*)packet->ptr(), packet->length())) if (SEND_ROW(thd, &thd->net, field_list.elements,
DBUG_RETURN(1); (char *)thd->packet.ptr(), thd->packet.length()))
DBUG_RETURN(-1);
} }
send_eof(&thd->net); send_eof(&thd->net);
DBUG_RETURN(0); DBUG_RETURN(0);
...@@ -927,8 +928,9 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list) ...@@ -927,8 +928,9 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list)
net_store_data(packet,convert,table->file->index_type(i)); net_store_data(packet,convert,table->file->index_type(i));
/* Comment */ /* Comment */
net_store_data(packet,convert,""); net_store_data(packet,convert,"");
if (my_net_write(&thd->net,(char*) packet->ptr(),packet->length())) if (SEND_ROW(thd, &thd->net, field_list.elements,
DBUG_RETURN(1); /* purecov: inspected */ (char *)thd->packet.ptr(), thd->packet.length()))
DBUG_RETURN(-1);
} }
} }
send_eof(&thd->net); send_eof(&thd->net);
...@@ -1351,8 +1353,9 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose) ...@@ -1351,8 +1353,9 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
net_store_data(packet,convert,thd_info->query); net_store_data(packet,convert,thd_info->query);
else else
net_store_null(packet); net_store_null(packet);
if (my_net_write(&thd->net,(char*) packet->ptr(),packet->length())) if (SEND_ROW(thd, &thd->net, field_list.elements,
break; /* purecov: inspected */ (char *)thd->packet.ptr(), thd->packet.length()))
break;
} }
send_eof(&thd->net); send_eof(&thd->net);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
...@@ -1638,8 +1641,9 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables) ...@@ -1638,8 +1641,9 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables)
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */
} }
if (my_net_write(&thd->net, (char*) packet2.ptr(),packet2.length())) if (SEND_ROW(thd, &thd->net, field_list.elements,
goto err; /* purecov: inspected */ (char *)packet2.ptr(), packet2.length()))
goto err;
} }
} }
pthread_mutex_unlock(&LOCK_status); pthread_mutex_unlock(&LOCK_status);
......
sql/sql_table.cc
View file @ 253c6419
...@@ -958,8 +958,7 @@ static int send_check_errmsg(THD* thd, TABLE_LIST* table, ...@@ -958,8 +958,7 @@ static int send_check_errmsg(THD* thd, TABLE_LIST* table,
net_store_data(packet, "error"); net_store_data(packet, "error");
net_store_data(packet, errmsg); net_store_data(packet, errmsg);
thd->net.last_error[0]=0; thd->net.last_error[0]=0;
if (my_net_write(&thd->net, (char*) thd->packet.ptr(), if (SEND_ROW(thd, &thd->net, 4, (char*) thd->packet.ptr(), packet->length()))
packet->length()))
return -1; return -1;
return 1; return 1;
} }
...@@ -1101,6 +1100,9 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables, ...@@ -1101,6 +1100,9 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
thd->open_options|= extra_open_options; thd->open_options|= extra_open_options;
table->table = open_ltable(thd, table, lock_type); table->table = open_ltable(thd, table, lock_type);
#ifdef EMBEDDED_LIBRARY
thd->net.last_errno= 0; // these errors shouldn't get client
#endif
thd->open_options&= ~extra_open_options; thd->open_options&= ~extra_open_options;
packet->length(0); packet->length(0);
if (prepare_func) if (prepare_func)
...@@ -1122,7 +1124,7 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables, ...@@ -1122,7 +1124,7 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
err_msg=ER(ER_CHECK_NO_SUCH_TABLE); err_msg=ER(ER_CHECK_NO_SUCH_TABLE);
net_store_data(packet, err_msg); net_store_data(packet, err_msg);
thd->net.last_error[0]=0; thd->net.last_error[0]=0;
if (my_net_write(&thd->net, (char*) thd->packet.ptr(), if (SEND_ROW(thd, &thd->net, field_list.elements, (char*) thd->packet.ptr(),
packet->length())) packet->length()))
goto err; goto err;
continue; continue;
...@@ -1137,7 +1139,7 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables, ...@@ -1137,7 +1139,7 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
net_store_data(packet, buff); net_store_data(packet, buff);
close_thread_tables(thd); close_thread_tables(thd);
table->table=0; // For query cache table->table=0; // For query cache
if (my_net_write(&thd->net, (char*) thd->packet.ptr(), if (SEND_ROW(thd, &thd->net, field_list.elements, (char*) thd->packet.ptr(),
packet->length())) packet->length()))
goto err; goto err;
continue; continue;
...@@ -1166,6 +1168,9 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables, ...@@ -1166,6 +1168,9 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
} }
int result_code = (table->table->file->*operator_func)(thd, check_opt); int result_code = (table->table->file->*operator_func)(thd, check_opt);
#ifdef EMBEDDED_LIBRARY
thd->net.last_errno= 0; // these errors shouldn't get client
#endif
packet->length(0); packet->length(0);
net_store_data(packet, table_name); net_store_data(packet, table_name);
net_store_data(packet, operator_name); net_store_data(packet, operator_name);
...@@ -1219,8 +1224,8 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables, ...@@ -1219,8 +1224,8 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
} }
close_thread_tables(thd); close_thread_tables(thd);
table->table=0; // For query cache table->table=0; // For query cache
if (my_net_write(&thd->net, (char*) packet->ptr(), if (SEND_ROW(thd, &thd->net, field_list.elements,
packet->length())) (char *)thd->packet.ptr(), thd->packet.length()))
goto err; goto err;
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7