Skip to content

M
MariaDB
Commit a62ee220 authored by unknown's avatar unknown
Browse files
Options

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

into genie.(none):/home/hf/work/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/net_pkg.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
parents 4ae5fd0b 4c4c31db
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 766 additions and 355 deletions
BitKeeper/etc/logging_ok
View file @ a62ee220
...@@ -19,6 +19,9 @@ heikki@donna.mysql.fi ...@@ -19,6 +19,9 @@ heikki@donna.mysql.fi
heikki@hundin.mysql.fi heikki@hundin.mysql.fi
heikki@rescue. heikki@rescue.
heikki@work.mysql.com heikki@work.mysql.com
hf@bison.(none)
hf@bisonxp.(none)
hf@genie.(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
......
client/mysqltest.c
View file @ a62ee220
...@@ -314,6 +314,10 @@ int mysql_rpl_parse_enabled(MYSQL* mysql __attribute__((unused))) { return 1; } ...@@ -314,6 +314,10 @@ int mysql_rpl_parse_enabled(MYSQL* mysql __attribute__((unused))) { return 1; }
my_bool mysql_rpl_probe(MYSQL *mysql __attribute__((unused))) { return 1; } my_bool mysql_rpl_probe(MYSQL *mysql __attribute__((unused))) { return 1; }
#endif #endif
#ifdef EMBEDDED_LIBRARY
#define mysql_send_query mysql_real_query
#endif
#define MAX_SERVER_ARGS 20 #define MAX_SERVER_ARGS 20
static int embedded_server_arg_count=0; static int embedded_server_arg_count=0;
......
include/mysql.h
View file @ a62ee220
...@@ -108,6 +108,9 @@ typedef struct st_mysql_data { ...@@ -108,6 +108,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 {
...@@ -137,13 +140,20 @@ struct st_mysql_options { ...@@ -137,13 +140,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};
...@@ -156,13 +166,19 @@ enum mysql_status { MYSQL_STATUS_READY,MYSQL_STATUS_GET_RESULT, ...@@ -156,13 +166,19 @@ 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;
...@@ -201,6 +217,9 @@ typedef struct st_mysql ...@@ -201,6 +217,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 @ a62ee220
...@@ -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 @ a62ee220
...@@ -26,6 +26,9 @@ C_MODE_START ...@@ -26,6 +26,9 @@ C_MODE_START
extern void start_embedded_connection(NET * net); extern void start_embedded_connection(NET * net);
extern void end_embedded_connection(NET * net); 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 void init_embedded_mysql(MYSQL *mysql, int client_flag, char *db);
const char *arg, ulong length); extern void *create_embedded_thd(Vio *vio, unsigned char *buff, int client_flag, char *db);
extern NET *get_mysql_net(MYSQL *mysql);
extern my_bool simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg,
ulong length, my_bool skipp_check);
C_MODE_END C_MODE_END
libmysqld/lib_sql.cc
View file @ a62ee220
This diff is collapsed.
libmysqld/lib_vio.c
View file @ a62ee220
...@@ -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 @ a62ee220
This diff is collapsed.
sql/field.cc
View file @ a62ee220
...@@ -4489,7 +4489,7 @@ void Field_blob::set_key_image(char *buff,uint length) ...@@ -4489,7 +4489,7 @@ void Field_blob::set_key_image(char *buff,uint length)
void Field_geom::get_key_image(char *buff,uint length, imagetype type) void Field_geom::get_key_image(char *buff,uint length, imagetype type)
{ {
length-=HA_KEY_BLOB_LENGTH; /* length-=HA_KEY_BLOB_LENGTH;
ulong blob_length=get_length(ptr); ulong blob_length=get_length(ptr);
char *blob; char *blob;
get_ptr(&blob); get_ptr(&blob);
...@@ -4504,12 +4504,19 @@ void Field_geom::get_key_image(char *buff,uint length, imagetype type) ...@@ -4504,12 +4504,19 @@ void Field_geom::get_key_image(char *buff,uint length, imagetype type)
float8store(buff+16, mbr.ymin); float8store(buff+16, mbr.ymin);
float8store(buff+24, mbr.ymax); float8store(buff+24, mbr.ymax);
return; return;
*/
Field_blob::get_key_image(buff, length, type);
} }
void Field_geom::set_key_image(char *buff,uint length) void Field_geom::set_key_image(char *buff,uint length)
{ {
Field_blob::set_key_image(buff, length);
} }
void Field_geom::sql_type(String &res) const
{
res.set("geometry", 8U, default_charset_info);
}
int Field_blob::key_cmp(const byte *key_ptr, uint max_key_length) int Field_blob::key_cmp(const byte *key_ptr, uint max_key_length)
{ {
...@@ -5162,6 +5169,7 @@ uint32 calc_pack_length(enum_field_types type,uint32 length) ...@@ -5162,6 +5169,7 @@ uint32 calc_pack_length(enum_field_types type,uint32 length)
case FIELD_TYPE_BLOB: return 2+portable_sizeof_char_ptr; case FIELD_TYPE_BLOB: return 2+portable_sizeof_char_ptr;
case FIELD_TYPE_MEDIUM_BLOB: return 3+portable_sizeof_char_ptr; case FIELD_TYPE_MEDIUM_BLOB: return 3+portable_sizeof_char_ptr;
case FIELD_TYPE_LONG_BLOB: return 4+portable_sizeof_char_ptr; case FIELD_TYPE_LONG_BLOB: return 4+portable_sizeof_char_ptr;
case FIELD_TYPE_GEOMETRY: return 2+portable_sizeof_char_ptr;
case FIELD_TYPE_SET: case FIELD_TYPE_SET:
case FIELD_TYPE_ENUM: abort(); return 0; // This shouldn't happen case FIELD_TYPE_ENUM: abort(); return 0; // This shouldn't happen
default: return 0; default: return 0;
...@@ -5209,15 +5217,15 @@ Field *make_field(char *ptr, uint32 field_length, ...@@ -5209,15 +5217,15 @@ Field *make_field(char *ptr, uint32 field_length,
f_packtype(pack_flag), f_packtype(pack_flag),
field_length); field_length);
if (f_is_geom(pack_flag))
return new Field_geom(ptr,null_pos,null_bit,
unireg_check, field_name, table,
pack_length,f_is_binary(pack_flag) != 0);
if (f_is_blob(pack_flag)) if (f_is_blob(pack_flag))
return new Field_blob(ptr,null_pos,null_bit, return new Field_blob(ptr,null_pos,null_bit,
unireg_check, field_name, table, unireg_check, field_name, table,
pack_length,f_is_binary(pack_flag) != 0, pack_length,f_is_binary(pack_flag) != 0,
default_charset_info); default_charset_info);
if (f_is_geom(pack_flag))
return new Field_geom(ptr,null_pos,null_bit,
unireg_check, field_name, table,
pack_length,f_is_binary(pack_flag) != 0);
if (interval) if (interval)
{ {
......
sql/field.h
View file @ a62ee220
...@@ -950,6 +950,8 @@ class Field_geom :public Field_blob { ...@@ -950,6 +950,8 @@ class Field_geom :public Field_blob {
:Field_blob(len_arg, maybe_null_arg, field_name_arg, :Field_blob(len_arg, maybe_null_arg, field_name_arg,
table_arg, binary_arg, default_charset_info) {} table_arg, binary_arg, default_charset_info) {}
enum ha_base_keytype key_type() const { return HA_KEYTYPE_VARBINARY; } enum ha_base_keytype key_type() const { return HA_KEYTYPE_VARBINARY; }
enum_field_types type() const { return FIELD_TYPE_GEOMETRY;}
void sql_type(String &str) const;
void get_key_image(char *buff,uint length, imagetype type); void get_key_image(char *buff,uint length, imagetype type);
void set_key_image(char *buff,uint length); void set_key_image(char *buff,uint length);
......
sql/ha_myisam.cc
View file @ a62ee220
...@@ -79,7 +79,7 @@ static void mi_check_print_msg(MI_CHECK *param, const char* msg_type, ...@@ -79,7 +79,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;
...@@ -1093,7 +1093,7 @@ int ha_myisam::create(const char *name, register TABLE *table, ...@@ -1093,7 +1093,7 @@ int ha_myisam::create(const char *name, register TABLE *table,
keydef[i].flag|=HA_AUTO_KEY; keydef[i].flag|=HA_AUTO_KEY;
found_auto_increment=1; found_auto_increment=1;
} }
if (field->type() == FIELD_TYPE_BLOB) if ((field->type() == FIELD_TYPE_BLOB) || (field->type() == FIELD_TYPE_GEOMETRY))
{ {
keydef[i].seg[j].flag|=HA_BLOB_PART; keydef[i].seg[j].flag|=HA_BLOB_PART;
/* save number of bytes used to pack length */ /* save number of bytes used to pack length */
......
sql/item.cc
View file @ a62ee220
...@@ -444,6 +444,9 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) ...@@ -444,6 +444,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; sl;
sl= sl->outer_select()) sl= sl->outer_select())
......
sql/item_strfunc.cc
View file @ a62ee220
...@@ -1367,10 +1367,15 @@ String *Item_func_database::val_str(String *str) ...@@ -1367,10 +1367,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 @ a62ee220
...@@ -869,3 +869,13 @@ inline void mark_as_null_row(TABLE *table) ...@@ -869,3 +869,13 @@ inline void mark_as_null_row(TABLE *table)
table->status|=STATUS_NULL_ROW; table->status|=STATUS_NULL_ROW;
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
sql/net_pkg.cc
View file @ a62ee220
...@@ -47,6 +47,12 @@ void send_error(THD *thd, uint sql_errno, const char *err) ...@@ -47,6 +47,12 @@ void send_error(THD *thd, 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
if (net->vio == 0) if (net->vio == 0)
{ {
if (thd->bootstrap) if (thd->bootstrap)
...@@ -69,6 +75,7 @@ void send_error(THD *thd, uint sql_errno, const char *err) ...@@ -69,6 +75,7 @@ void send_error(THD *thd, uint sql_errno, const char *err)
set_if_smaller(length,MYSQL_ERRMSG_SIZE-1); set_if_smaller(length,MYSQL_ERRMSG_SIZE-1);
} }
VOID(net_write_command(net,(uchar) 255, "", 0, (char*) err,length)); VOID(net_write_command(net,(uchar) 255, "", 0, (char*) err,length));
#endif /* EMBEDDED_LIBRARY*/
thd->fatal_error=0; // Error message is given thd->fatal_error=0; // Error message is given
thd->net.report_error= 0; thd->net.report_error= 0;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
...@@ -158,6 +165,7 @@ net_printf(THD *thd, uint errcode, ...) ...@@ -158,6 +165,7 @@ net_printf(THD *thd, 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
if (net->vio == 0) if (net->vio == 0)
{ {
if (thd->bootstrap) if (thd->bootstrap)
...@@ -175,6 +183,10 @@ net_printf(THD *thd, uint errcode, ...) ...@@ -175,6 +183,10 @@ net_printf(THD *thd, 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
thd->fatal_error=0; // Error message is given thd->fatal_error=0; // Error message is given
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
...@@ -205,6 +217,7 @@ net_printf(THD *thd, uint errcode, ...) ...@@ -205,6 +217,7 @@ net_printf(THD *thd, uint errcode, ...)
If net->no_send_ok return without sending packet If net->no_send_ok return without sending packet
*/ */
#ifndef EMBEDDED_LIBRARY
void void
send_ok(THD *thd, ha_rows affected_rows, ulonglong id, const char *message) send_ok(THD *thd, ha_rows affected_rows, ulonglong id, const char *message)
...@@ -290,6 +303,7 @@ send_eof(THD *thd, bool no_flush) ...@@ -290,6 +303,7 @@ send_eof(THD *thd, bool no_flush)
} }
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
#endif /* EMBEDDED_LIBRARY */
/**************************************************************************** /****************************************************************************
......
sql/sql_acl.cc
View file @ a62ee220
...@@ -2635,8 +2635,12 @@ ulong get_table_grant(THD *thd, TABLE_LIST *table) ...@@ -2635,8 +2635,12 @@ ulong get_table_grant(THD *thd, TABLE_LIST *table)
GRANT_TABLE *grant_table; GRANT_TABLE *grant_table;
rw_rdlock(&LOCK_grant); rw_rdlock(&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 @ a62ee220
...@@ -195,7 +195,6 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild) ...@@ -195,7 +195,6 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild)
DBUG_RETURN(open_list); DBUG_RETURN(open_list);
} }
/* /*
Send name and type of result to client converted to a given char set Send name and type of result to client converted to a given char set
...@@ -216,6 +215,8 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild) ...@@ -216,6 +215,8 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild)
1 Error (Note that in this case the error is not sent to the client) 1 Error (Note that in this case the error is not sent to the client)
*/ */
#ifndef EMBEDDED_LIBRARY
bool bool
send_convert_fields(THD *thd,List<Item> &list,CONVERT *convert,uint flag) send_convert_fields(THD *thd,List<Item> &list,CONVERT *convert,uint flag)
{ {
...@@ -439,6 +440,7 @@ send_fields(THD *thd, List<Item> &list, uint flag) ...@@ -439,6 +440,7 @@ send_fields(THD *thd, List<Item> &list, uint flag)
DBUG_RETURN(1); /* purecov: inspected */ DBUG_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 @ a62ee220
...@@ -448,6 +448,8 @@ bool select_send::send_fields(List<Item> &list,uint flag) ...@@ -448,6 +448,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)
...@@ -482,6 +484,7 @@ bool select_send::send_data(List<Item> &items) ...@@ -482,6 +484,7 @@ bool select_send::send_data(List<Item> &items)
else else
DBUG_RETURN(1); DBUG_RETURN(1);
} }
#endif /* EMBEDDED_LIBRARY */
bool select_send::send_eof() bool select_send::send_eof()
{ {
......
sql/sql_class.h
View file @ a62ee220
...@@ -335,6 +335,10 @@ class select_result; ...@@ -335,6 +335,10 @@ class select_result;
#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)
struct system_variables struct system_variables
...@@ -393,6 +397,9 @@ class THD :public ilink { ...@@ -393,6 +397,9 @@ class THD :public ilink {
struct rand_struct rand; // used for authentication struct rand_struct rand; // used for authentication
struct system_variables variables; // Changeable local variables struct system_variables variables; // Changeable local variables
pthread_mutex_t LOCK_delete; // Locked before thd is deleted pthread_mutex_t LOCK_delete; // Locked before thd is deleted
#ifdef EMBEDDED_LIBRARY
struct st_mysql *mysql;
#endif
char *query; // Points to the current query, char *query; // Points to the current query,
/* /*
......
sql/sql_handler.cc
View file @ a62ee220
...@@ -233,7 +233,7 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables, ...@@ -233,7 +233,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 @ a62ee220
...@@ -839,8 +839,9 @@ int mysql_table_dump(THD* thd, char* db, char* tbl_name, int fd) ...@@ -839,8 +839,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;
...@@ -879,6 +880,7 @@ bool do_command(THD *thd) ...@@ -879,6 +880,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)
...@@ -3157,7 +3159,6 @@ bool add_field_to_list(char *field_name, enum_field_types type, ...@@ -3157,7 +3159,6 @@ bool add_field_to_list(char *field_name, enum_field_types type,
case FIELD_TYPE_STRING: case FIELD_TYPE_STRING:
case FIELD_TYPE_VAR_STRING: case FIELD_TYPE_VAR_STRING:
case FIELD_TYPE_NULL: case FIELD_TYPE_NULL:
case FIELD_TYPE_GEOMETRY:
break; break;
case FIELD_TYPE_DECIMAL: case FIELD_TYPE_DECIMAL:
if (!length) if (!length)
...@@ -3170,6 +3171,7 @@ bool add_field_to_list(char *field_name, enum_field_types type, ...@@ -3170,6 +3171,7 @@ bool add_field_to_list(char *field_name, enum_field_types type,
case FIELD_TYPE_TINY_BLOB: case FIELD_TYPE_TINY_BLOB:
case FIELD_TYPE_LONG_BLOB: case FIELD_TYPE_LONG_BLOB:
case FIELD_TYPE_MEDIUM_BLOB: case FIELD_TYPE_MEDIUM_BLOB:
case FIELD_TYPE_GEOMETRY:
if (default_value) // Allow empty as default value if (default_value) // Allow empty as default value
{ {
String str,*res; String str,*res;
...@@ -3305,7 +3307,7 @@ bool add_field_to_list(char *field_name, enum_field_types type, ...@@ -3305,7 +3307,7 @@ bool add_field_to_list(char *field_name, enum_field_types type,
if (new_field->length >= MAX_FIELD_WIDTH || if (new_field->length >= MAX_FIELD_WIDTH ||
(!new_field->length && !(new_field->flags & BLOB_FLAG) && (!new_field->length && !(new_field->flags & BLOB_FLAG) &&
type != FIELD_TYPE_STRING && type != FIELD_TYPE_VAR_STRING)) type != FIELD_TYPE_STRING && type != FIELD_TYPE_VAR_STRING && type != FIELD_TYPE_GEOMETRY))
{ {
net_printf(thd,ER_TOO_BIG_FIELDLENGTH,field_name, net_printf(thd,ER_TOO_BIG_FIELDLENGTH,field_name,
MAX_FIELD_WIDTH-1); /* purecov: inspected */ MAX_FIELD_WIDTH-1); /* purecov: inspected */
......
sql/sql_select.cc
View file @ a62ee220
...@@ -5358,6 +5358,9 @@ end_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), ...@@ -5358,6 +5358,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;
......
sql/sql_show.cc
View file @ a62ee220
...@@ -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)
{ {
...@@ -87,8 +85,8 @@ mysqld_show_dbs(THD *thd,const char *wild) ...@@ -87,8 +85,8 @@ mysqld_show_dbs(THD *thd,const char *wild)
{ {
packet->length(0); packet->length(0);
net_store_data(packet, thd->variables.convert_set, file_name); net_store_data(packet, thd->variables.convert_set, file_name);
if (my_net_write(&thd->net, (char*) packet->ptr(), if (SEND_ROW(thd, &thd->net, field_list.elements,
packet->length())) (char *)packet->ptr(), packet->length()))
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
} }
...@@ -127,7 +125,8 @@ int mysqld_show_open_tables(THD *thd,const char *wild) ...@@ -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,convert, open_list->table);
net_store_data(packet,open_list->in_use); net_store_data(packet,open_list->in_use);
net_store_data(packet,open_list->locked); 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); DBUG_RETURN(-1);
} }
...@@ -169,7 +168,8 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild) ...@@ -169,7 +168,8 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild)
{ {
packet->length(0); packet->length(0);
net_store_data(packet, thd->variables.convert_set, file_name); 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); DBUG_RETURN(-1);
} }
send_eof(thd); send_eof(thd);
...@@ -635,9 +635,9 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild) ...@@ -635,9 +635,9 @@ 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 *)packet->ptr(), packet->length()))
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
send_eof(thd); send_eof(thd);
DBUG_RETURN(0); DBUG_RETURN(0);
...@@ -647,7 +647,6 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild) ...@@ -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 ** List all columns in a table_list->real_name
***************************************************************************/ ***************************************************************************/
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)
...@@ -750,8 +749,8 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild, ...@@ -750,8 +749,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)
...@@ -763,8 +762,9 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild, ...@@ -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,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 *)packet->ptr(), packet->length()))
DBUG_RETURN(-1);
} }
} }
} }
...@@ -833,8 +833,9 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list) ...@@ -833,8 +833,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 *)packet->ptr(), packet->length()))
DBUG_RETURN(-1);
} }
send_eof(thd); send_eof(thd);
DBUG_RETURN(0); DBUG_RETURN(0);
...@@ -956,8 +957,9 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list) ...@@ -956,8 +957,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 *)packet->ptr(), packet->length()))
DBUG_RETURN(-1);
} }
} }
send_eof(thd); send_eof(thd);
...@@ -1384,8 +1386,9 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose) ...@@ -1384,8 +1386,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 *)packet->ptr(), packet->length()))
break;
} }
send_eof(thd); send_eof(thd);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
...@@ -1684,8 +1687,9 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables, ...@@ -1684,8 +1687,9 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables,
net_store_data(&packet2, ""); // Safety net_store_data(&packet2, ""); // Safety
break; break;
} }
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 @ a62ee220
...@@ -397,6 +397,16 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, ...@@ -397,6 +397,16 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
sql_field->unireg_check=Field::BLOB_FIELD; sql_field->unireg_check=Field::BLOB_FIELD;
blob_columns++; blob_columns++;
break; break;
case FIELD_TYPE_GEOMETRY:
sql_field->pack_flag=FIELDFLAG_GEOM |
pack_length_to_packflag(sql_field->pack_length -
portable_sizeof_char_ptr);
if (sql_field->flags & BINARY_FLAG)
sql_field->pack_flag|=FIELDFLAG_BINARY;
sql_field->length=8; // Unireg field length
sql_field->unireg_check=Field::BLOB_FIELD;
blob_columns++;
break;
case FIELD_TYPE_VAR_STRING: case FIELD_TYPE_VAR_STRING:
case FIELD_TYPE_STRING: case FIELD_TYPE_STRING:
sql_field->pack_flag=0; sql_field->pack_flag=0;
...@@ -1007,8 +1017,7 @@ static int send_check_errmsg(THD* thd, TABLE_LIST* table, ...@@ -1007,8 +1017,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;
} }
...@@ -1178,6 +1187,9 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables, ...@@ -1178,6 +1187,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)
...@@ -1199,7 +1211,7 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables, ...@@ -1199,7 +1211,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;
...@@ -1214,7 +1226,7 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables, ...@@ -1214,7 +1226,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;
...@@ -1243,6 +1255,9 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables, ...@@ -1243,6 +1255,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);
...@@ -1298,8 +1313,8 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables, ...@@ -1298,8 +1313,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