resolved conflicts

sql/sql_lex.h:
  Auto merged
Docs/manual.texi:
  merged/resolved conflicts

sql/sql_lex.h

@@ -127,6 +127,7 @@ typedef struct st_lex {
   HA_CHECK_OPT   check_opt;			// check/repair options
   HA_CREATE_INFO create_info;
   LEX_MASTER_INFO mi;				// used by CHANGE MASTER
+  char* backup_dir;                             // used by RESTORE/BACKUP
   ulong thread_id,type;
   ulong options;
   enum_sql_command sql_command;