Commit d11d6d69 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/my/mysql-5.0


configure.in:
  Auto merged
sql/handler.h:
  Auto merged
parents c4cc1173 9ca50fe1

client/mysqldump.c

+7 −6
Original line number Diff line number Diff line
@@ -1623,12 +1623,13 @@ static void dumpTable(uint numFields, char *table) 
	   we'll dump in hex only BLOB columns.

	*/

        is_blob= (opt_hex_blob && field->charsetnr == 63 &&

                  (field->type == FIELD_TYPE_STRING ||

                   field->type == FIELD_TYPE_VAR_STRING ||

                   field->type == FIELD_TYPE_BLOB ||

                   field->type == FIELD_TYPE_LONG_BLOB ||

                   field->type == FIELD_TYPE_MEDIUM_BLOB ||

                   field->type == FIELD_TYPE_TINY_BLOB)) ? 1 : 0;

                  (field->type == MYSQL_TYPE_STRING ||

                   field->type == MYSQL_TYPE_VAR_STRING ||

                   field->type == MYSQL_TYPE_VARCHAR ||

                   field->type == MYSQL_TYPE_BLOB ||

                   field->type == MYSQL_TYPE_LONG_BLOB ||

                   field->type == MYSQL_TYPE_MEDIUM_BLOB ||

                   field->type == MYSQL_TYPE_TINY_BLOB)) ? 1 : 0;

	if (extended_insert)

	{

	  ulong length = lengths[i];

client/mysqltest.c

+1 −1
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ int var_set(const char *var_name, const char *var_name_end, 
  }

  else

    v = var_reg + digit;

  return eval_expr(v, var_val, (const char**)&var_val_end);

  DBUG_RETURN(eval_expr(v, var_val, (const char**)&var_val_end));

}

configure.in

+0 −7
Original line number Diff line number Diff line
@@ -2414,7 +2414,6 @@ AC_SUBST(readline_basedir) 
AC_SUBST(readline_link)

AC_SUBST(readline_h_ln_cmd)



MYSQL_CHECK_ISAM

MYSQL_CHECK_BDB

MYSQL_CHECK_INNODB

MYSQL_CHECK_EXAMPLEDB
@@ -2475,12 +2474,6 @@ then 
  # Configuration for optional table handlers

  #



  if test X"$have_isam" != Xno

  then

    sql_server_dirs="$sql_server_dirs isam merge"

    AC_CONFIG_FILES(isam/Makefile merge/Makefile)

  fi



  if test X"$have_berkeley_db" != Xno; then

    if test X"$have_berkeley_db" != Xyes; then

      # we must build berkeley db from source

heap/heapdef.h

+3 −1
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ extern ulong hp_mask(ulong hashnr,ulong buffmax,ulong maxlength); 
extern void hp_movelink(HASH_INFO *pos,HASH_INFO *next_link,

			 HASH_INFO *newlink);

extern int hp_rec_key_cmp(HP_KEYDEF *keydef,const byte *rec1,

			  const byte *rec2);

			  const byte *rec2,

                          my_bool diff_if_only_endspace_difference);

extern int hp_key_cmp(HP_KEYDEF *keydef,const byte *rec,

		      const byte *key);

extern void hp_make_key(HP_KEYDEF *keydef,byte *key,const byte *rec);
@@ -94,6 +95,7 @@ extern uint hp_rb_make_key(HP_KEYDEF *keydef, byte *key, 
			   const byte *rec, byte *recpos);

extern uint hp_rb_key_length(HP_KEYDEF *keydef, const byte *key);

extern uint hp_rb_null_key_length(HP_KEYDEF *keydef, const byte *key);

extern uint hp_rb_var_key_length(HP_KEYDEF *keydef, const byte *key);

extern my_bool hp_if_null_in_key(HP_KEYDEF *keyinfo, const byte *record);

extern int hp_close(register HP_INFO *info);

extern void hp_clear(HP_SHARE *info);

heap/hp_create.c

+15 −1
Original line number Diff line number Diff line
@@ -76,9 +76,21 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef, 
	case HA_KEYTYPE_UINT24:

	case HA_KEYTYPE_INT8:

	  keyinfo->seg[j].flag|= HA_SWAP_KEY;

          break;

        case HA_KEYTYPE_VARBINARY:

          /* Case-insensitiveness is handled in coll->hash_sort */

          keyinfo->seg[j].type= HA_KEYTYPE_VARTEXT;

          /* fall_through */

        case HA_KEYTYPE_VARTEXT:

          if (!my_binary_compare(keyinfo->seg[j].charset))

            keyinfo->flag|= HA_END_SPACE_KEY;

          keyinfo->flag|= HA_VAR_LENGTH_KEY;

          break;

	default:

	  break;

	}

        if (keyinfo->seg[j].flag & HA_END_SPACE_ARE_EQUAL)

          keyinfo->flag|= HA_END_SPACE_KEY;

      }

      keyinfo->length= length;

      length+= keyinfo->rb_tree.size_of_element +
@@ -89,7 +101,9 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef, 
      if (keyinfo->algorithm == HA_KEY_ALG_BTREE)

      {

        key_segs++; /* additional HA_KEYTYPE_END segment */

        if (keyinfo->flag & HA_NULL_PART_KEY)

        if (keyinfo->flag & HA_VAR_LENGTH_KEY)

          keyinfo->get_key_length= hp_rb_var_key_length;

        else if (keyinfo->flag & HA_NULL_PART_KEY)

          keyinfo->get_key_length= hp_rb_null_key_length;

        else

          keyinfo->get_key_length= hp_rb_key_length;