Commit e0aeba21 authored by unknown's avatar unknown
Browse files

After merge fixes 

Marked some functions as noreturn


sql/mysql_priv.h:
  Marked some functions as noreturn
storage/federated/ha_federated.cc:
  After merge fix
storage/myisam/ft_boolean_search.c:
  Removed duplicate code
storage/myisam/myisamchk.c:
  Added LINT_INIT()
storage/myisam/myisampack.c:
  After merge fix
storage/myisam/sort.c:
  Indentation fixup
parent 600336ef

sql/mysql_priv.h

+2 −2
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+0 −1
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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;