Commit ba3b78d9 authored by unknown's avatar unknown
Browse files

Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysys/mf_keycache.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
parents 343e9bbd 8bdb5001

client/mysql.cc

+3 −10
Original line number Diff line number Diff line
@@ -1430,12 +1430,6 @@ static void build_completion_hash(bool rehash, bool write_info) 
  if (status.batch || quick || !current_db)

    DBUG_VOID_RETURN;			// We don't need completion in batches



  if (tables)

  {

    mysql_free_result(tables);

    tables=0;

  }



  /* hash SQL commands */

  while (cmd->name) {

    add_word(&ht,(char*) cmd->name);
@@ -1681,7 +1675,7 @@ static int com_server_help(String *buffer __attribute__((unused)), 
    else if (num_fields >= 2 && num_rows)

    {

      init_pager();

      char last_char;

      char last_char= 0;



      int num_name= 0, num_cat= 0;

      LINT_INIT(num_name);
@@ -1693,7 +1687,6 @@ static int com_server_help(String *buffer __attribute__((unused)), 
	put_info("To make a more specific request, please type 'help <item>',\nwhere <item> is one of the following", INFO_INFO);

	num_name= 0;

	num_cat= 1;

	last_char= '_';

      }

      else if ((cur= mysql_fetch_row(result)))

      {

client/mysqlbinlog.cc

+1 −5
Original line number Diff line number Diff line
@@ -717,11 +717,7 @@ static int check_master_version(MYSQL* mysql) 


  if (mysql_query(mysql, "SELECT VERSION()") ||

      !(res = mysql_store_result(mysql)))

  {

    mysql_close(mysql);

    die("Error checking master version: %s",

		    mysql_error(mysql));

  }

    die("Error checking master version: %s", mysql_error(mysql));

  if (!(row = mysql_fetch_row(res)))

  {

    mysql_free_result(res);

client/mysqldump.c

+2 −3
Original line number Diff line number Diff line
@@ -2328,7 +2328,6 @@ static const char *check_if_ignore_table(const char *table_name) 
    fprintf(stderr,

	    "Error: Couldn't read status information for table %s (%s)\n",

	    table_name, mysql_error(sock));

    if (res)

    mysql_free_result(res);

    return 0;					/* assume table is ok */

  }

client/mysqltest.c

+3 −2
Original line number Diff line number Diff line
@@ -715,9 +715,10 @@ VAR* var_get(const char* var_name, const char** var_name_end, my_bool raw, 
      die("Empty variable");

    }

    length= (uint) (var_name - save_var_name);

    if (length >= MAX_VAR_NAME)

      die("Too long variable name: %s", save_var_name);



    if (!(v = (VAR*) hash_search(&var_hash, save_var_name, length)) &&

        length < MAX_VAR_NAME)

    if (!(v = (VAR*) hash_search(&var_hash, save_var_name, length)))

    {

      char buff[MAX_VAR_NAME+1];

      strmake(buff, save_var_name, length);

isam/sort.c

+3 −0
Original line number Diff line number Diff line
@@ -122,7 +122,10 @@ uint sortbuff_size; 
					  MYF(0))))

	break;

      else

      {

	my_free((gptr) sort_keys,MYF(0));

        sort_keys= 0;

      }

    }

    old_memavl=memavl;

    if ((memavl=memavl/4*3) < MIN_SORT_MEMORY && old_memavl > MIN_SORT_MEMORY)