1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
This commit is contained in:
unknown 2004-07-17 01:08:25 +03:00
commit 910131fd23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/mysqlhotcopy.sh
View File

@ -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;

5
sql/item_strfunc.h
View File

@ -359,9 +359,10 @@ class Item_func_database :public Item_str_func
public:
Item_func_database() { collation.set(system_charset_info,DERIVATION_IMPLICIT); }
String *val_str(String *);
void fix_length_and_dec()
{
void fix_length_and_dec()
{
max_length= MAX_FIELD_NAME * system_charset_info->mbmaxlen;
maybe_null=1;
}
const char *func_name() const { return "database"; }
};