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, 2 insertions, 5 deletions

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index d71db58ed32..be90e6d6e16 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -857,7 +857,6 @@ extern "C" pthread_handler_decl(handle_bootstrap,arg)
 		 TRANS_MEM_ROOT_BLOCK_SIZE, TRANS_MEM_ROOT_PREALLOC);
   while (fgets(buff, thd->net.max_packet, file))
   {
-    printf("%s", buff);
     uint length=(uint) strlen(buff);
     while (length && (my_isspace(system_charset_info, buff[length-1]) ||
            buff[length-1] == ';'))
@@ -940,9 +939,7 @@ int mysql_table_dump(THD* thd, char* db, char* tbl_name, int fd)
     my_error(ER_GET_ERRNO, MYF(0));
     goto err;
   }
-#ifndef EMBEDDED_LIBRARY
   net_flush(&thd->net);
-#endif
   if ((error = table->file->dump(thd,fd)))
     my_error(ER_GET_ERRNO, MYF(0));
 
@@ -3239,7 +3236,7 @@ mysql_parse(THD *thd, char *inBuf, uint length)
 	else
 	{
 	  mysql_execute_command(thd);
-#ifndef EMBEDDED_LIBRARY
+#ifndef EMBEDDED_LIBRARY  /* TODO query cache in embedded library*/
 	  query_cache_end_of_result(&thd->net);
 #endif
 	}
@@ -3249,7 +3246,7 @@ mysql_parse(THD *thd, char *inBuf, uint length)
     {
       DBUG_PRINT("info",("Command aborted. Fatal_error: %d",
 			 thd->fatal_error));
-#ifndef EMBEDDED_LIBRARY
+#ifndef EMBEDDED_LIBRARY   /* TODO query cache in embedded library*/
       query_cache_abort(&thd->net);
 #endif
     }