resolved conflicts

037516b7 · sasha@mysql.sashanet.com · f2f515e5 · af9e034d · 037516b7 · 037516b7
Commit 037516b7 authored Sep 16, 2000 by sasha@mysql.sashanet.com
Expand all Show whitespace changes
Inline Side-by-side

Showing with 315 additions and 33 deletions

Docs/manual.texi Docs/manual.texi +313 -32

sql/sql_lex.h sql/sql_lex.h +2 -1

No files found.
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
--- a/sql/sql_lex.h
+++ b/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;