Commit 248e4494 authored by unknown's avatar unknown
Browse files

Remove compiler warnings and remove not used variables 

(Found during build process)


extra/comp_err.c:
  Remove compiler warnings
extra/perror.c:
  Remove compiler warnings
innobase/dict/dict0dict.c:
  Remove compiler warnings
innobase/dict/dict0load.c:
  Remove compiler warnings
innobase/pars/pars0sym.c:
  Remove compiler warnings
innobase/row/row0row.c:
  Remove compiler warnings
innobase/row/row0sel.c:
  Remove compiler warnings
libmysqld/lib_sql.cc:
  Remove not used variables
myisam/mi_key.c:
  Remove compiler warnings
regex/engine.c:
  Added comment
sql/derror.cc:
  Remove not used variables
sql/examples/ha_archive.cc:
  Fixed bug in blob handling
  Removed not used variable
sql/field.cc:
  Remove compiler warnings
  Remove not used variables
sql/filesort.cc:
  Remove compiler warnings
sql/ha_heap.cc:
  Remove not used variable
sql/ha_innodb.cc:
  Remove not used variables
  Remove compiler warnings
sql/handler.cc:
  Remove compiler warnings and remove not used variables
sql/item.cc:
  Remove compiler warnings and remove not used variables
sql/item_subselect.cc:
  Remove compiler warnings
sql/item_sum.cc:
  Remove compiler warnings
sql/item_sum.h:
  Remove compiler warnings and remove not used variables
sql/log.cc:
  Remove compiler warnings and remove not used variables
sql/log_event.cc:
  Remove compiler warnings
sql/mysqld.cc:
  Remove compiler warnings and remove not used variables
sql/opt_range.cc:
  Remove compiler warnings and remove not used variables
sql/slave.cc:
  Remove compiler warnings and remove not used variables
sql/sp_pcontext.cc:
  Remove compiler warnings and remove not used variables
sql/sql_acl.cc:
  Remove compiler warnings and remove not used variables
sql/sql_analyse.cc:
  Remove compiler warnings and remove not used variables
sql/sql_base.cc:
  Remove compiler warnings and remove not used variables
sql/sql_db.cc:
  Remove compiler warnings and remove not used variables
sql/sql_help.cc:
  Remove compiler warnings and remove not used variables
sql/sql_insert.cc:
  Remove compiler warnings and remove not used variables
sql/sql_load.cc:
  Remove compiler warnings and remove not used variables
sql/sql_parse.cc:
  Remove compiler warnings and remove not used variables
sql/sql_prepare.cc:
  Remove compiler warnings and remove not used variables
sql/sql_select.cc:
  Remove compiler warnings and remove not used variables
sql/sql_show.cc:
  Remove compiler warnings and remove not used variables
sql/sql_table.cc:
  Remove compiler warnings
sql/sql_union.cc:
  Remove compiler warnings
sql/sql_update.cc:
  Remove compiler warnings and remove not used variables
sql/sql_yacc.yy:
  Remove compiler warnings and remove not used variables
sql/strfunc.cc:
  Remove compiler warnings and remove not used variables
strings/ctype-ucs2.c:
  Remove compiler warnings
tests/mysql_client_test.c:
  Remove compiler warnings and remove not used variables
tools/mysqlmanager.c:
  Remove compiler warnings and remove not used variables
parent eb18f93a

extra/comp_err.c

+2 −2
Original line number Diff line number Diff line
@@ -332,13 +332,13 @@ static int create_sys_files(struct languages *lang_head, 
    head[30]= csnum;



    my_fseek(to, 0l, MY_SEEK_SET, MYF(0));

    if (my_fwrite(to, head, HEADER_LENGTH, MYF(MY_WME | MY_FNABP)))

    if (my_fwrite(to, (byte*) head, HEADER_LENGTH, MYF(MY_WME | MY_FNABP)))

      goto err;



    for (i= 0; i < row_count; i++)

    {

      int2store(head, file_pos[i]);

      if (my_fwrite(to, head, 2, MYF(MY_WME | MY_FNABP)))

      if (my_fwrite(to, (byte*) head, 2, MYF(MY_WME | MY_FNABP)))

	goto err;

    }

    my_fclose(to, MYF(0));

extra/perror.c

+2 −1
Original line number Diff line number Diff line
@@ -250,7 +250,8 @@ int main(int argc,char *argv[]) 
        'Unknown Error' (without regard to case).

      */

      if (msg &&

          my_strnncoll(&my_charset_latin1, msg, 13, "Unknown Error", 13) &&

          my_strnncoll(&my_charset_latin1, (const uchar*) msg, 13,

                       (const uchar*) "Unknown Error", 13) &&

          (!unknown_error || strcmp(msg, unknown_error)))

      {

	found=1;

innobase/dict/dict0dict.c

+1 −1
Original line number Diff line number Diff line
@@ -2472,7 +2472,7 @@ dict_scan_id( 
		my_isspace(). Only after that, convert id names to UTF-8. */



		b = (byte*)(*id);

		id_len = strlen(b);

		id_len = strlen((char*) b);

		

		if (id_len >= 3 && b[id_len - 1] == 0xA0

			       && b[id_len - 2] == 0xC2) {

innobase/dict/dict0load.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ dict_print(void) 


		if (table == NULL) {

			fputs("InnoDB: Failed to load table ", stderr);

			ut_print_namel(stderr, NULL, field, len);

			ut_print_namel(stderr, NULL, (char*) field, len);

			putc('\n', stderr);

		} else {

			/* The table definition was corrupt if there

innobase/pars/pars0sym.c

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ sym_tab_add_id( 
	node->resolved = FALSE;

	node->indirection = NULL;



	node->name = mem_heap_strdupl(sym_tab->heap, name, len + 1);

	node->name = mem_heap_strdupl(sym_tab->heap, (char*) name, len + 1);

	node->name_len = len;



	UT_LIST_ADD_LAST(sym_list, sym_tab->sym_list, node);