Commit 97dae003 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/kostja/mysql/tmp_merge 

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_base.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
mysys/my_bitmap.c:
  Manual merge
sql/field.cc:
  e
  Manual merge
sql/item.cc:
  Manual merge (new Field_bit_as_char constructor signature)
sql/item_func.cc:
  Manual merge: use local
sql/sql_insert.cc:
  Manual merge: add VOID() around bitmap_init
parents f0263ac4 d9e7af26

Docs/Makefile.am

+5 −5
Original line number Diff line number Diff line
@@ -45,22 +45,22 @@ CLEAN_FILES: $(TXT_FILES) 
GT = $(srcdir)/Support/generate-text-files.pl



../INSTALL-SOURCE:	mysql.info $(GT)

	perl -w $(GT) $< "installing-source" "windows-source-build" > $@

	perl -w $(GT) mysql.info "installing-source" "windows-source-build" > $@



../INSTALL-WIN-SOURCE:	mysql.info $(GT)

	perl -w $(GT) $< "windows-source-build" "post-installation" > $@

	perl -w $(GT) mysql.info "windows-source-build" "post-installation" > $@



# We put the description for the binary installation here so that

# people who download source wont have to see it. It is moved up to

# the toplevel by the script that makes the binary tar files.

INSTALL-BINARY:	mysql.info $(GT)

	perl -w $(GT) $< "installing-binary" "installing-source" > $@

	perl -w $(GT) mysql.info "installing-binary" "installing-source" > $@



../EXCEPTIONS-CLIENT: mysql.info $(GT)

	perl -w $(GT) $< "mysql-floss-license-exception" "function-index" > $@

	perl -w $(GT) mysql.info "mysql-floss-license-exception" "function-index" > $@



../support-files/MacOSX/ReadMe.txt:	mysql.info $(GT)

	perl -w $(GT) $< "mac-os-x-installation" "netware-installation" > $@

	perl -w $(GT) mysql.info "mac-os-x-installation" "netware-installation" > $@



# Don't update the files from bitkeeper

%::SCCS/s.%

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
@@ -1293,12 +1293,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
@@ -1311,7 +1311,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);

}
@@ -2134,7 +2134,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)
@@ -2664,7 +2667,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 */
@@ -2719,7 +2722,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 */
@@ -2878,7 +2881,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: