Resolving merge conflicts

BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
sql/convert.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_handler.cc:
  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
libmysqld/lib_sql.cc:
  merging
sql/item_strfunc.cc:
  merging

BitKeeper/etc/logging_ok

@@ -21,6 +21,9 @@ heikki@donna.mysql.fi
 heikki@hundin.mysql.fi
 heikki@rescue.
 heikki@work.mysql.com
+hf@bison.(none)
+hf@bisonxp.(none)
+hf@deer.mysql.r18.ru
 hf@genie.(none)
 jani@dsl-jkl1657.dial.inet.fi
 jani@hynda.(none)

client/mysqltest.c

@@ -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; }
 #endif
 
+#ifdef EMBEDDED_LIBRARY
+#define mysql_send_query mysql_real_query
+#endif
+
 #define MAX_SERVER_ARGS 20
 
 static int embedded_server_arg_count=0;

include/mysql.h

@@ -114,6 +114,9 @@ typedef struct st_mysql_data {
   unsigned int fields;
   MYSQL_ROWS *data;
   MEM_ROOT alloc;
+#ifdef EMBEDDED_LIBRARY
+  MYSQL_ROWS **prev_ptr;
+#endif
 } MYSQL_DATA;
 
 struct st_mysql_options {
@@ -143,6 +146,9 @@ struct st_mysql_options {
    a read that is replication-aware
  */
   my_bool no_master_reads;
+#ifdef EMBEDDED_LIBRARY
+  my_bool separate_thread;
+#endif
   char *shared_memory_base_name;
   unsigned int protocol;
 };
@@ -152,6 +158,9 @@ enum mysql_option
   MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS, MYSQL_OPT_NAMED_PIPE, MYSQL_INIT_COMMAND,
   MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP,MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME,
   MYSQL_OPT_LOCAL_INFILE, MYSQL_OPT_PROTOCOL, MYSQL_SHARED_MEMORY_BASE_NAME
+#ifdef EMBEDDED_LIBRARY
+  , MYSQL_OPT_USE_RESULT
+#endif
 };
 
 enum mysql_status 
@@ -174,13 +183,19 @@ enum mysql_rpl_type
   MYSQL_RPL_MASTER, MYSQL_RPL_SLAVE, MYSQL_RPL_ADMIN
 };
 
+struct st_mysql_res;
 
 typedef struct st_mysql
 {
   NET		net;			/* Communication parameters */
   gptr		connector_fd;		/* ConnectorFd for SSL */
-  char		*host,*user,*passwd,*unix_socket,*server_version,*host_info,
-		*info,*db;
+#ifndef _0EMBEDDED_LIBRARY
+  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;
   MYSQL_FIELD	*fields;
   MEM_ROOT	field_alloc;
@@ -221,6 +236,9 @@ typedef struct st_mysql
 
 
 typedef struct st_mysql_res {
+#ifdef EMBEDDED_LIBRARY
+  const char    *query_str;
+#endif
   my_ulonglong row_count;
   MYSQL_FIELD	*fields;
   MYSQL_DATA	*data;

include/violite.h

@@ -32,7 +32,11 @@ extern "C" {
 #endif /* __cplusplus */
 
 enum enum_vio_type { VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET,
-		     VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL,VIO_TYPE_SHARED_MEMORY};
+		     VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL,VIO_TYPE_SHARED_MEMORY
+#ifdef EMBEDDED_LIBRARY
+		     , VIO_TYPE_BUFFER
+#endif
+};
 
 #ifndef __WIN__
 #define HANDLE void *

libmysqld/embedded_priv.h

@@ -26,6 +26,9 @@ C_MODE_START
 extern void start_embedded_connection(NET * net);
 extern void end_embedded_connection(NET * net);
 extern void lib_connection_phase(NET *net, int phase);
-extern bool lib_dispatch_command(enum enum_server_command command, NET *net,
-				 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);
+extern my_bool simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg,
+		       ulong length, my_bool skipp_check);
 C_MODE_END

libmysqld/lib_vio.c

@@ -42,14 +42,7 @@
 
 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 */
-  char			desc[30];	/* String description */
   void *dest_thd;
   char *packets, **last_packet;
   char *where_in_packet, *end_of_packet;
@@ -57,6 +50,7 @@ struct st_vio
   MEM_ROOT root;
 };
 
+
 /* Initialize the communication buffer */
 
 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);
     vio->root.min_malloc = sizeof(char *) + 4;
     vio->last_packet = &vio->packets;
+    vio->type = type;
   }
   DBUG_RETURN(vio);
 }
@@ -219,4 +214,22 @@ my_bool vio_poll_read(Vio *vio,uint timeout)
   return 0;
 }
 
+int create_vio(NET *net, int separate_thread)
+{
+  Vio * v  = net->vio;
+  if (!v)
+  {
+    v = vio_new(0, separate_thread ? VIO_TYPE_SHARED_MEMORY : VIO_TYPE_BUFFER, 0);
+    net->vio = v;
+  }
+  return !v;
+}
+
+void set_thd(Vio *v, void *thd)
+{
+  if (v)
+  {
+    v -> dest_thd = thd;
+  } 
+}
 #endif /* HAVE_VIO */

sql/convert.cc

@@ -463,3 +463,12 @@ bool CONVERT::store(String *packet,const char *from,uint length)
   packet->length((uint) (to-packet->ptr()));
   return 0;
 }
+
+#ifdef EMBEDDED_LIBRARY
+void CONVERT::convert_back(char *dest, const char *source, uint length) const
+{
+  for (char *end= dest+length; dest < end; dest++, source++)
+    *dest= to_map[*source];
+}
+#endif
+

sql/field.cc

@@ -4465,7 +4465,7 @@ void Field_blob::set_key_image(char *buff,uint length)
 
 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);
   char *blob;
   get_ptr(&blob);
@@ -4480,12 +4480,19 @@ void Field_geom::get_key_image(char *buff,uint length, imagetype type)
   float8store(buff+16, mbr.ymin);
   float8store(buff+24, mbr.ymax);
   return;
+*/
+  Field_blob::get_key_image(buff, length, type);
 }
 
 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)
 {
@@ -5144,6 +5151,7 @@ uint32 calc_pack_length(enum_field_types type,uint32 length)
   case FIELD_TYPE_BLOB:		return 2+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_GEOMETRY:	return 2+portable_sizeof_char_ptr;
   case FIELD_TYPE_SET:
   case FIELD_TYPE_ENUM: abort(); return 0;	// This shouldn't happen
   default: return 0;
@@ -5190,15 +5198,14 @@ Field *make_field(char *ptr, uint32 field_length,
 				      f_packtype(pack_flag),
 				      field_length);
 
-    if (f_is_blob(pack_flag))
-      return new Field_blob(ptr,null_pos,null_bit,
-			    unireg_check, field_name, table,
-			    pack_length, field_charset);
     if (f_is_geom(pack_flag))
       return new Field_geom(ptr,null_pos,null_bit,
 			    unireg_check, field_name, table,
 			    pack_length);
-
+    if (f_is_blob(pack_flag))
+      return new Field_blob(ptr,null_pos,null_bit,
+			    unireg_check, field_name, table,
+			    pack_length, field_charset);
     if (interval)
     {
       if (f_is_enum(pack_flag))

sql/field.h

@@ -924,6 +924,8 @@ public:
      :Field_blob(len_arg, maybe_null_arg, field_name_arg,
                  table_arg, my_charset_bin) {}
   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 set_key_image(char *buff,uint length);

sql/ha_myisam.cc

@@ -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, msgbuf);
-  if (my_net_write(&thd->net, (char*)thd->packet.ptr(), thd->packet.length()))
+  if (SEND_ROW(thd, 4, (char*)thd->packet.ptr(), thd->packet.length()))
     sql_print_error("Failed on my_net_write, writing to stderr instead: %s\n",
 		    msgbuf);
   return;
@@ -1101,7 +1101,7 @@ int ha_myisam::create(const char *name, register TABLE *table_arg,
 	keydef[i].flag|=HA_AUTO_KEY;
 	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;
 	/* save number of bytes used to pack length */

sql/item.cc

@@ -533,7 +533,9 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
 	cause error ER_NON_UNIQ_ERROR in find_field_in_tables.
       */
       SELECT_LEX *last= 0;
-      
+#ifdef EMBEDDED_LIBRARY
+      thd->net.last_errno= 0;
+#endif
       Item **refer= (Item **)not_found_item;
       // Prevent using outer fields in subselects, that is not supported now
       SELECT_LEX *cursel=(SELECT_LEX *) thd->lex.current_select;
@@ -918,11 +920,72 @@ bool Item::send(THD *thd, String *packet)
   return net_store_data(packet,res->ptr(),res->length());
 }
 
+
 bool Item_null::send(THD *thd, String *packet)
 {
   return net_store_null(packet);
 }
 
+#ifdef EMBEDDED_LIBRARY
+bool Item::embedded_send(const CONVERT *convert, CHARSET_INFO *charset, MEM_ROOT *alloc, 
+			 char **result, ulong *length)
+{
+  char buff[MAX_FIELD_WIDTH];
+  String s(buff, sizeof(buff), charset), *value;
+  if (!(value=val_str(&s)) ||
+      !(*result=alloc_root(alloc, value->length() + 1)))
+  {
+    *result= NULL;
+    *length= 0;
+    return false;
+  }
+  if (!(*result=alloc_root(alloc, value->length() + 1)))
+    return true;
+  *length= value->length();
+  if (convert)
+    convert->convert_back(*result, value->ptr(), *length);
+  else
+    memcpy(*result, value->ptr(), *length);
+  (*result)[*length]= 0;
+  return false;
+}
+
+bool Item_null::embedded_send(const CONVERT *convert, CHARSET_INFO *charset, MEM_ROOT *alloc, 
+			     char **result, ulong *length)
+{
+  *result= NULL;
+  *length= 0;
+  return false;
+}
+
+bool Item_field::embedded_send(const CONVERT *convert, CHARSET_INFO *charset, MEM_ROOT *alloc, 
+			       char **result, ulong *length)
+{
+  if (result_field->is_null())
+  {
+    *result= NULL;
+    *length= 0;
+    return false;
+  }
+
+  char buff[MAX_FIELD_WIDTH];
+  String tmp(buff,sizeof(buff),default_charset_info);
+  result_field->val_str(&tmp,&tmp);
+
+  if (!(*result=alloc_root(alloc, tmp.length() + 1)))
+    return true;
+  *length= tmp.length();
+  if (convert)
+    convert->convert_back(*result, tmp.ptr(), *length);
+  else
+    memcpy(*result, tmp.ptr(), *length);
+  (*result)[*length]= 0;
+  return false;
+}
+
+#endif
+
+
 /*
   This is used for HAVING clause
   Find field in select list having the same name

sql/item.h

@@ -19,7 +19,7 @@
 #pragma interface			/* gcc class implementation */
 #endif
 
-struct st_table_list;
+class CONVERT;
 void item_init(void);			/* Init item functions */
 
 class Item {
@@ -60,6 +60,10 @@ public:
   virtual int save_safe_in_field(Field *field)
   { return save_in_field(field, 1); }
   virtual bool send(THD *thd, String *str);
+#ifdef EMBEDDED_LIBRARY
+  virtual bool embedded_send(const CONVERT *convert, CHARSET_INFO *charset, MEM_ROOT *alloc, 
+			     char **result, ulong *length);
+#endif
   virtual bool eq(const Item *, bool binary_cmp) const;
   virtual Item_result result_type () const { return REAL_RESULT; }
   virtual enum Type type() const =0;
@@ -193,6 +197,10 @@ public:
   {
     return result_field->send(thd,str_arg);
   }
+#ifdef EMBEDDED_LIBRARY
+  bool embedded_send(const CONVERT *convert, CHARSET_INFO *charset, MEM_ROOT *alloc, 
+		     char **result, ulong *length);
+#endif
   void make_field(Send_field *field);
   bool fix_fields(THD *, struct st_table_list *, Item **);
   int save_in_field(Field *field,bool no_conversions);
@@ -225,6 +233,10 @@ public:
   enum Item_result result_type () const
   { return STRING_RESULT; }
   bool send(THD *thd, String *str);
+#ifdef EMBEDDED_LIBRARY
+  bool embedded_send(const CONVERT *convert, CHARSET_INFO *charset, MEM_ROOT *alloc, 
+		     char **result, ulong *length);
+#endif
   bool basic_const_item() const { return 1; }
   Item *new_item() { return new Item_null(name); }
   bool is_null() { return 1; }
@@ -495,6 +507,11 @@ public:
     return (null_value=(*ref)->get_date(ltime,fuzzydate));
   }
   bool send(THD *thd, String *tmp)	{ return (*ref)->send(thd, tmp); }
+#ifdef EMBEDDED_LIBRARY
+  bool embedded_send(const CONVERT *convert, CHARSET_INFO *charset, MEM_ROOT *alloc, 
+		     char **result, ulong *length)
+    { return (*ref)->embedded_send(convert, charset, alloc, result, length); }
+#endif
   void make_field(Send_field *field)	{ (*ref)->make_field(field); }
   bool fix_fields(THD *, struct st_table_list *, Item **);
   int save_in_field(Field *field, bool no_conversions)

sql/item_strfunc.cc

@@ -1394,6 +1394,11 @@ String *Item_func_user::val_str(String *str)
   const char   *host=thd->host ? thd->host : thd->ip ? thd->ip : "";
   uint32       res_length=(strlen(thd->user)+strlen(host)+10) * cs->mbmaxlen;
 
+#ifdef EMBEDDED_LIBRARY
+  if (str->copy("localuser@localhost", (uint)strlen("localuser@localhost"), cs))
+    return &empty_string;
+#else
+
   if (str->alloc(res_length))
   {
       null_value=1;
@@ -1401,6 +1406,7 @@ String *Item_func_user::val_str(String *str)
   }
   res_length=cs->snprintf(cs, (char*)str->ptr(), res_length, "%s@%s",thd->user,host);
   str->length(res_length);
+#endif
   str->set_charset(cs);
   return str;
 }

sql/mysql_priv.h

@@ -902,6 +902,14 @@ inline void mark_as_null_row(TABLE *table)
   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, n_fields, data, data_len)\
+  embedded_send_row(thd, n_fields, data, data_len)
+#else
+#define SEND_ROW(thd, n_fields, data, data_len)\
+  my_net_write(&thd->net, data, data_len)
+#endif
 compare_func_creator comp_eq_creator(bool invert);
 compare_func_creator comp_ge_creator(bool invert);
 compare_func_creator comp_gt_creator(bool invert);

sql/net_pkg.cc

@@ -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 (thd->bootstrap)
@@ -69,6 +75,7 @@ void send_error(THD *thd, uint sql_errno, const char *err)
     set_if_smaller(length,MYSQL_ERRMSG_SIZE-1);
   }
   VOID(net_write_command(net,(uchar) 255, "", 0, (char*) err,length));
+#endif  /* EMBEDDED_LIBRARY*/
   thd->fatal_error=0;			// Error message is given
   thd->net.report_error= 0;
   DBUG_VOID_RETURN;
@@ -158,6 +165,7 @@ net_printf(THD *thd, uint errcode, ...)
     length=sizeof(net->last_error)-1;		/* purecov: inspected */
   va_end(args);
 
+#ifndef EMBEDDED_LIBRARY
   if (net->vio == 0)
   {
     if (thd->bootstrap)
@@ -175,6 +183,10 @@ net_printf(THD *thd, uint errcode, ...)
   if (offset)
     int2store(text_pos-2, errcode);
   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
   DBUG_VOID_RETURN;
 }
@@ -205,6 +217,7 @@ net_printf(THD *thd, uint errcode, ...)
 
    If net->no_send_ok return without sending packet
 */    
+#ifndef EMBEDDED_LIBRARY
 
 void
 send_ok(THD *thd, ha_rows affected_rows, ulonglong id, const char *message)
@@ -290,6 +303,7 @@ send_eof(THD *thd, bool no_flush)
   }
   DBUG_VOID_RETURN;
 }
+#endif /* EMBEDDED_LIBRARY */
 
 
 /****************************************************************************

sql/sql_acl.cc

@@ -2706,8 +2706,12 @@ ulong get_table_grant(THD *thd, TABLE_LIST *table)
   GRANT_TABLE *grant_table;
 
   rw_rdlock(&LOCK_grant);
+#ifdef EMBEDDED_LIBRARY
+  grant_table= NULL;
+#else
   grant_table = table_hash_search(thd->host,thd->ip,db,user,
 				       table->real_name,0);
+#endif
   table->grant.grant_table=grant_table; // Remember for column test
   table->grant.version=grant_version;
   if (grant_table)

sql/sql_base.cc

@@ -195,7 +195,6 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild)
   DBUG_RETURN(open_list);
 }
 
-
 /*
   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)
     1	Error  (Note that in this case the error is not sent to the client)
 */
 
+#ifndef EMBEDDED_LIBRARY
+
 bool
 send_convert_fields(THD *thd,List<Item> &list,CONVERT *convert,uint flag)
 {
@@ -439,6 +440,7 @@ err:
   DBUG_RETURN(1);				/* purecov: inspected */
 }
 
+#endif /* EMBEDDED_LIBRARY */
 
 /*****************************************************************************
  *	 Functions to free open table cache

sql/sql_class.cc

@@ -507,6 +507,8 @@ bool select_send::send_fields(List<Item> &list,uint flag)
 }
 
 
+#ifndef EMBEDDED_LIBRARY
+
 /* Send data to client. Returns 0 if ok */
 
 bool select_send::send_data(List<Item> &items)
@@ -541,6 +543,7 @@ bool select_send::send_data(List<Item> &items)
   else
     DBUG_RETURN(1);
 }
+#endif /* EMBEDDED_LIBRARY */
 
 bool select_send::send_eof()
 {

sql/sql_class.h

@@ -178,6 +178,9 @@ public:
     convert_array(from_map, (uchar*) a,length);
   }
   bool store(String *, const char *,uint);
+#ifdef EMBEDDED_LIBRARY
+  void convert_back(char *dest, const char *source, uint length) const;
+#endif
   inline uint number() { return numb; }
 };
 
@@ -338,6 +341,10 @@ class select_result;
 #define THD_SENTRY_MAGIC 0xfeedd1ff
 #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)
 
 struct system_variables
@@ -396,6 +403,9 @@ public:
   struct  rand_struct rand;		// used for authentication
   struct  system_variables variables;	// Changeable local variables
   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,
   /*

sql/sql_handler.cc

@@ -233,7 +233,7 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
             goto err;
           }
         }
-        my_net_write(&thd->net, (char*)packet->ptr(), packet->length());
+	SEND_ROW(thd, list.elements, (char*)packet->ptr(), packet->length());
       }
     }
     num_rows++;

sql/sql_parse.cc

@@ -930,8 +930,9 @@ err:
 }
 
 
-	/* 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)
 {
   char *packet;
@@ -969,6 +970,7 @@ bool do_command(THD *thd)
   DBUG_RETURN(dispatch_command(command,thd, packet+1, (uint) packet_length));
 }
 
+#endif  /* EMBEDDED_LIBRARY */
 
 bool dispatch_command(enum enum_server_command command, THD *thd,
 		      char* packet, uint packet_length)
@@ -3247,7 +3249,6 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type,
     allowed_type_modifier= AUTO_INCREMENT_FLAG;
     break;
   case FIELD_TYPE_NULL:
-  case FIELD_TYPE_GEOMETRY:
     break;
   case FIELD_TYPE_DECIMAL:
     if (!length)
@@ -3271,6 +3272,7 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type,
   case FIELD_TYPE_TINY_BLOB:
   case FIELD_TYPE_LONG_BLOB:
   case FIELD_TYPE_MEDIUM_BLOB:
+  case FIELD_TYPE_GEOMETRY:
     if (new_field->length)
     {
       /* The user has given a length to the blob column */
@@ -3420,7 +3422,7 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type,
 
   if (new_field->length >= MAX_FIELD_WIDTH ||
       (!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,
 	       MAX_FIELD_WIDTH-1);		/* purecov: inspected */

sql/sql_select.cc

@@ -5543,6 +5543,9 @@ end_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
   {
     Item *item= *group->item;
     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 */
     if (item->maybe_null)
       group->buff[-1]=item->null_value ? 1 : 0;

sql/sql_show.cc

@@ -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, 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, 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, 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, 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)
@@ -684,13 +683,14 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild,
     field_list.push_back(new Item_empty_string("Comment",255));
   }
         // Send first number of fields and records
+#ifndef EMBEDDED_LIBRARY
   {
     char *pos;
     pos=net_store_length(tmp, (uint) field_list.elements);
     pos=net_store_length(pos,(ulonglong) file->records);
     (void) my_net_write(&thd->net,tmp,(uint) (pos-tmp));
   }
-
+#endif
   if (send_fields(thd,field_list,0))
     DBUG_RETURN(1);
   restore_record(table,2);      // Get empty record
@@ -750,8 +750,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 +763,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, field_list.elements, 
+		     (char *)packet->ptr(), packet->length()))
+	  DBUG_RETURN(-1);
       }
     }
   }
@@ -833,8 +834,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, field_list.elements, 
+			  (char *)packet->ptr(), packet->length()))
+      DBUG_RETURN(-1);
   }
   send_eof(thd);
   DBUG_RETURN(0);
@@ -956,8 +958,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, field_list.elements, 
+			    (char *)packet->ptr(), packet->length()))
+	DBUG_RETURN(-1);
     }
   }
   send_eof(thd);
@@ -1388,8 +1391,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, field_list.elements, 
+			  (char *)packet->ptr(), packet->length()))
+      break;
   }
   send_eof(thd);
   DBUG_VOID_RETURN;
@@ -1688,8 +1692,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, field_list.elements, 
+		   (char *)packet2.ptr(), packet2.length()))
+	goto err;
     }
   }
   pthread_mutex_unlock(&LOCK_status);

sql/sql_table.cc

@@ -418,6 +418,16 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
       sql_field->unireg_check=Field::BLOB_FIELD;
       blob_columns++;
       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->charset->state & MY_CS_BINSORT)
+	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_STRING:
       sql_field->pack_flag=0;
@@ -1029,8 +1039,7 @@ static int send_check_errmsg(THD* thd, TABLE_LIST* table,
   net_store_data(packet, "error");
   net_store_data(packet, errmsg);
   thd->net.last_error[0]=0;
-  if (my_net_write(&thd->net, (char*) thd->packet.ptr(),
-		   packet->length()))
+  if (SEND_ROW(thd, 4, (char*) thd->packet.ptr(), packet->length()))
     return -1;
   return 1;
 }
@@ -1200,6 +1209,9 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
 
     thd->open_options|= extra_open_options;
     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;
     packet->length(0);
     if (prepare_func)
@@ -1221,7 +1233,7 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
 	err_msg=ER(ER_CHECK_NO_SUCH_TABLE);
       net_store_data(packet, err_msg);
       thd->net.last_error[0]=0;
-      if (my_net_write(&thd->net, (char*) thd->packet.ptr(),
+      if (SEND_ROW(thd, field_list.elements, (char*) thd->packet.ptr(),
 		       packet->length()))
 	goto err;
       continue;
@@ -1236,7 +1248,7 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
       net_store_data(packet, buff);
       close_thread_tables(thd);
       table->table=0;				// For query cache
-      if (my_net_write(&thd->net, (char*) thd->packet.ptr(),
+      if (SEND_ROW(thd, field_list.elements, (char*) thd->packet.ptr(),
 		       packet->length()))
 	goto err;
       continue;
@@ -1265,6 +1277,9 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
     }
 
     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);
     net_store_data(packet, table_name);
     net_store_data(packet, operator_name);
@@ -1325,8 +1340,8 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
     }
     close_thread_tables(thd);
     table->table=0;				// For query cache
-    if (my_net_write(&thd->net, (char*) packet->ptr(),
-		     packet->length()))
+    if (SEND_ROW(thd, field_list.elements, 
+			  (char *)thd->packet.ptr(), thd->packet.length()))
       goto err;
   }