SCRUM

embedded-related changes


include/mysql_com.h:
  net_flush emptification
libmysqld/lib_sql.cc:
  Some Protocol:: methods implemented
sql/convert.cc:
  changes to use convert in embedded library
sql/field.cc:
  set_key_image changed
sql/item.cc:
  obsolete functions removed
sql/item.h:
  embedded-related changes in Protocol class
sql/log.cc:
  there's no ports in embedded library
sql/mysqld.cc:
  some debug stuff
sql/protocol.cc:
  embedded-related changes
sql/protocol.h:
  embedded-related changes
sql/sql_cache.cc:
  comment added
sql/sql_class.cc:
  no need to do special embedded select_send::send_row
sql/sql_class.h:
  embedded-related changes
sql/sql_parse.cc:
  comments added debugging stuff deleted
sql/sql_show.cc:
  non-protocol sending removed

1 files changed, 1 insertions, 13 deletions

diff --git a/sql/convert.cc b/sql/convert.cc
index 444a454d2af..29abdde7ddc 100644
--- a/sql/convert.cc
+++ b/sql/convert.cc
@@ -457,18 +457,6 @@ bool CONVERT::store(String *packet,const char *from,uint length)
     return 1;
   char *to=(char*) net_store_length((char*) packet->ptr()+packet_length,
 				    (ulonglong)length);
-
-  for (const char *end=from+length ; from != end ; from++)
-    *to++= to_map[(uchar) *from];
-  packet->length((uint) (to-packet->ptr()));
+  packet->length((uint) (store_dest(to, from, length)-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
-