Commit a82fd1ea authored by unknown's avatar unknown
Browse files

merged 


BitKeeper/deleted/.del-sort.c~e2e56b5a37ce86f4:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_packrec.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
tests/client_test.c:
  Auto merged
parents 7eb825a0 7109999b

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
@@ -780,11 +780,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
@@ -2436,7 +2436,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
@@ -733,9 +733,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);

myisam/ft_boolean_search.c

+6 −5
Original line number Diff line number Diff line
@@ -346,11 +346,12 @@ static void _ftb_init_index_search(FT_INFO *ftb) 
        if (ftbe->flags & FTB_FLAG_NO ||                     /* 2 */

             ftbe->up->ythresh - ftbe->up->yweaks >1)        /* 1 */

        {

          FTB_EXPR *top_ftbe=ftbe->up->up;

          FTB_EXPR *top_ftbe=ftbe->up;

          ftbw->docid[0]=HA_OFFSET_ERROR;

          for (ftbe=ftbw->up; ftbe != top_ftbe; ftbe=ftbe->up)

            if (!(ftbe->flags & FTB_FLAG_NO))

              ftbe->yweaks++;

          for (ftbe=(FTB_EXPR *)ftbw;

               ftbe != top_ftbe && !(ftbe->flags & FTB_FLAG_NO);

               ftbe=ftbe->up)

              ftbe->up->yweaks++;

          ftbe=0;

          break;

        }