Commit 1fd2fdfa authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 

into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1
parents 296796e3 be0e166f

scripts/mysqlhotcopy.sh

+1 −0
Original line number Diff line number Diff line
@@ -635,6 +635,7 @@ sub copy_index 
    my $to="$target/$file";

    my $buff;

    open(INPUT, "<$from") || die "Can't open file $from: $!\n";

    binmode(INPUT, ":raw");

    my $length=read INPUT, $buff, 2048;

    die "Can't read index header from $from\n" if ($length < 1024);

    close INPUT;

sql/item_strfunc.h

+3 −2
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ class Item_func_database :public Item_str_func 
  void fix_length_and_dec()

  {

    max_length= MAX_FIELD_NAME * system_charset_info->mbmaxlen;

    maybe_null=1;

  }

  const char *func_name() const { return "database"; }

};