bk commit into 5.2 tree (rafal:1.2529)

[rsomla]

Below is the list of changes that have just been committed into a local
5.2 repository of rafal. When rafal does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-27 20:46:08+02:00, rafal@quant.(none) +1 -0
  Connects backup SQL interface with backup kernel code.

  sql/sql_parse.cc@stripped, 2007-06-27 20:46:06+02:00, rafal@quant.(none) +22 -2
    Call backup kernel API for BACKUP/RESTORE commands.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	rafal
# Host:	quant.(none)
# Root:	/ext/mysql/bk/backup/alpha

--- 1.684/sql/sql_parse.cc	2007-06-27 20:46:12 +02:00
+++ 1.685/sql/sql_parse.cc	2007-06-27 20:46:12 +02:00
@@ -28,6 +28,8 @@
 #include "events.h"
 #include "sql_trigger.h"
 
+int execute_backup_command(THD*,LEX*);
+
 /* Used in error handling only */
 #define SP_TYPE_STRING(LP) \
   ((LP)->sphead->m_type == TYPE_ENUM_FUNCTION ? "FUNCTION" : "PROCEDURE")
@@ -1848,13 +1850,31 @@
 #endif
 
   case SQLCOM_SHOW_ARCHIVE:
+#ifdef EMBEDDED_LIBRARY
+    // Note: online backup code doesn't compile as embedded library yet.
+    my_error(ER_NOT_SUPPORTED_YET, MYF(0), "SHOW ARCHIVE");
+    goto error;
+#endif
   case SQLCOM_BACKUP:
+#ifdef EMBEDDED_LIBRARY
+    my_error(ER_NOT_SUPPORTED_YET, MYF(0), "BACKUP");
+    goto error;
+#endif
   case SQLCOM_RESTORE:
+#ifdef EMBEDDED_LIBRARY
+    my_error(ER_NOT_SUPPORTED_YET, MYF(0), "RESTORE");
+    goto error;
+#else
   {
-    sql_print_information("\nOnline backup command stub reached.\n");
-    send_ok(thd); 
+    /*
+      Note: execute_backup_command() sends a correct response to the client
+      (either ok, result set or error message).
+     */  
+    if (execute_backup_command(thd,lex))
+      goto error;
     break;
   }
+#endif
 
   case SQLCOM_ASSIGN_TO_KEYCACHE:
   {