After merge fixes

Marked some functions as noreturn

sql/mysql_priv.h

@@ -1722,7 +1722,7 @@ void unlock_table_names(THD *thd, TABLE_LIST *table_list,
 /* old unireg functions */
 
 void unireg_init(ulong options);
-void unireg_end(void);
+void unireg_end(void) __attribute__((noreturn));
 bool mysql_create_frm(THD *thd, const char *file_name,
                       const char *db, const char *table,
 		      HA_CREATE_INFO *create_info,
@@ -2007,7 +2007,7 @@ inline bool is_user_table(TABLE * table)
 */
 
 #ifndef EMBEDDED_LIBRARY
-extern "C" void unireg_abort(int exit_code);
+extern "C" void unireg_abort(int exit_code) __attribute__((noreturn));
 void kill_delayed_threads(void);
 bool check_stack_overrun(THD *thd, long margin, char *dummy);
 #else

storage/federated/ha_federated.cc

@@ -2020,8 +2020,8 @@ int ha_federated::delete_row(const byte *buf)
   {
     DBUG_RETURN(stash_remote_error());
   }
-  deleted+= (ha_rows) mysql->affected_rows;
-  records-= (ha_rows) mysql->affected_rows;
+  stats.deleted+= (ha_rows) mysql->affected_rows;
+  stats.records-= (ha_rows) mysql->affected_rows;
   DBUG_PRINT("info",
              ("rows deleted %ld  rows deleted for all time %ld",
               (long) mysql->affected_rows, (long) stats.deleted));

storage/myisam/ft_boolean_search.c

@@ -333,7 +333,6 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search)
   MI_INFO *info=ftb->info;
   uint off, extra=HA_FT_WLEN+info->s->base.rec_reflength;
   byte *lastkey_buf=ftbw->word+ftbw->off;
-  LINT_INIT(off);
 
   LINT_INIT(off);
   if (ftbw->flags & FTB_FLAG_TRUNC)

storage/myisam/myisamchk.c

@@ -697,6 +697,7 @@ get_one_option(int optid,
   {
     int method;
     enum_mi_stats_method method_conv;
+    LINT_INIT(method_conv);
     myisam_stats_method_str= argument;
     if ((method=find_type(argument, &myisam_stats_method_typelib, 2)) <= 0)
     {

storage/myisam/myisampack.c

@@ -2279,6 +2279,7 @@ static my_off_t write_huff_tree(HUFF_TREE *huff_tree, uint trees)
         if (bits > 8 * sizeof(code))
         {
           VOID(fflush(stdout));
+          VOID(fprintf(stderr, "error: Huffman code too long: %u/%u\n",
                        bits, (uint) (8 * sizeof(code))));
           errors++;
           break;

storage/myisam/sort.c

@@ -899,7 +899,6 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file,
   BUFFPEK *buffpek,**refpek;
   QUEUE queue;
   volatile int *killed= killed_ptr(info->sort_info->param);
-
   DBUG_ENTER("merge_buffers");
 
   count=error=0;