merge with 5.3

sql/sql_insert.cc:
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
  ******
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
  small cleanup
  ******
  small cleanup

1 files changed, 7 insertions, 1 deletions

diff --git a/include/myisamchk.h b/include/myisamchk.h
index 57a015238e0..bd184c75e7e 100644
--- a/include/myisamchk.h
+++ b/include/myisamchk.h
@@ -74,7 +74,7 @@
 #define TT_USEFRM               1
 #define TT_FOR_UPGRADE          2
 
-#define O_NEW_INDEX	1			/* Bits set in out_flag */
+/* Bits set in out_flag */
 #define O_NEW_DATA	2
 #define O_DATA_LOST	4
 
@@ -141,6 +141,7 @@ typedef struct st_handler_check_param
   ulonglong use_buffers;                        /* Used as param to getopt() */
   size_t read_buffer_length, write_buffer_length;
   size_t sort_buffer_length, sort_key_blocks;
+  time_t backup_time;                           /* To sign backup files */
   ulong rec_per_key_part[HA_MAX_KEY_SEG * HA_MAX_POSSIBLE_KEY];
   double new_rec_per_key_part[HA_MAX_KEY_SEG * HA_MAX_POSSIBLE_KEY];
   uint out_flag, warning_printed, error_printed, verbose;
@@ -154,6 +155,11 @@ typedef struct st_handler_check_param
   char temp_filename[FN_REFLEN];
   IO_CACHE read_cache;
   enum_handler_stats_method stats_method;
+  /* For reporting progress */
+  uint stage, max_stage;
+  uint progress_counter;             /* How often to call _report_progress() */
+  ulonglong progress, max_progress;
+
   mysql_mutex_t print_msg_mutex;
   my_bool need_print_msg_lock;
 } HA_CHECK;