Commit c489cdeb authored by unknown's avatar unknown
Browse files

merged 


myisam/mi_delete.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents 5e7cbbcb 307c0b77

client/mysqladmin.cc

+1 −0
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
	return -1;

      }

      mysql_close(mysql);	/* Close connection to avoid error messages */

      argc=1;                   /* force SHUTDOWN to be the last command    */

      if (got_pidfile)

      {

	if (opt_verbose)

client/mysqlbinlog.cc

+5 −4
Original line number Diff line number Diff line
@@ -1266,12 +1266,13 @@ at offset %lu ; this could be a log format error or read error", 
      }

      else if (buf[4] == ROTATE_EVENT)

      {

        Log_event *ev;

        my_b_seek(file, tmp_pos); /* seek back to event's start */

        if (!Log_event::read_log_event(file, *description_event))

        if (!(ev= Log_event::read_log_event(file, *description_event)))

          /* EOF can't be hit here normally, so it's a real error */

          die("Could not read a Rotate_log_event event \

at offset %lu ; this could be a log format error or read error",

              tmp_pos);

          die("Could not read a Rotate_log_event event at offset %lu ;"

              " this could be a log format error or read error", tmp_pos);

        delete ev;

      }

      else

        break;

client/mysqldump.c

+15 −12
Original line number Diff line number Diff line
@@ -1306,7 +1306,7 @@ static uint dump_routines_for_db(char *db) 
  fprintf(sql_file, "DELIMITER ;\n");



  if (lock_tables)

    mysql_query_with_error_report(sock, 0, "UNLOCK TABLES");

    VOID(mysql_query_with_error_report(sock, 0, "UNLOCK TABLES"));

  DBUG_RETURN(0);

}
@@ -2095,7 +2095,10 @@ static void dump_table(char *table, char *db) 
    else

      res=mysql_store_result(sock);

    if (!res)

    {

      DB_error(sock, "when retrieving data from server");

      goto err;

    }

    if (verbose)

      fprintf(stderr, "-- Retrieving rows...\n");

    if (mysql_num_fields(res) != num_fields)
@@ -2625,7 +2628,7 @@ static int dump_all_tables_in_db(char *database) 
    check_io(md_result_file);

  }

  if (lock_tables)

    mysql_query_with_error_report(sock, 0, "UNLOCK TABLES");

    VOID(mysql_query_with_error_report(sock, 0, "UNLOCK TABLES"));

  return 0;

} /* dump_all_tables_in_db */
@@ -2680,7 +2683,7 @@ static my_bool dump_all_views_in_db(char *database) 
    check_io(md_result_file);

  }

  if (lock_tables)

    mysql_query(sock,"UNLOCK TABLES");

    VOID(mysql_query_with_error_report(sock, 0, "UNLOCK TABLES"));

  return 0;

} /* dump_all_tables_in_db */
@@ -2839,7 +2842,7 @@ static int dump_selected_tables(char *db, char **table_names, int tables) 
    check_io(md_result_file);

  }

  if (lock_tables)

    mysql_query_with_error_report(sock, 0, "UNLOCK TABLES");

    VOID(mysql_query_with_error_report(sock, 0, "UNLOCK TABLES"));

  DBUG_RETURN(0);

} /* dump_selected_tables */

cmd-line-utils/libedit/history.c

+2 −2
Original line number Diff line number Diff line
@@ -676,8 +676,8 @@ history_load(History *h, const char *fname) 
		(void) strunvis(ptr, line);

		line[sz] = c;

		if (HENTER(h, &ev, ptr) == -1) {

			h_free((ptr_t)ptr);

			return -1;

                  i = -1;

                  goto oomem;

		}

	}

oomem:

include/my_base.h

+2 −1
Original line number Diff line number Diff line
@@ -404,7 +404,8 @@ enum ha_base_keytype { 
enum en_fieldtype {

  FIELD_LAST=-1,FIELD_NORMAL,FIELD_SKIP_ENDSPACE,FIELD_SKIP_PRESPACE,

  FIELD_SKIP_ZERO,FIELD_BLOB,FIELD_CONSTANT,FIELD_INTERVALL,FIELD_ZERO,

  FIELD_VARCHAR,FIELD_CHECK

  FIELD_VARCHAR,FIELD_CHECK,

  FIELD_enum_val_count

};



enum data_file_type {