mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 15:25:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge work.mysql.com:/home/bk/mysql

Browse source 
into work.mysql.com:/home/bk/mysql-4.0


acinclude.m4:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
This commit is contained in:
unknown 2001-09-20 19:51:48 +02:00
commit 0ef8576a17
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
acinclude.m4
View file

@ -1152,8 +1152,7 @@ dnl echo "DBG_GEM1: gemini='$gemini'"
gemini_libs="\
../gemini/api/libapi.a\
../gemini/db/libdb.a\
../gemini/dbut/libdbut.a\
../gemini/vst/libvst.a"
../gemini/dbut/libdbut.a"
AC_MSG_RESULT([Using Gemini DB])
;;
esac

1
sql-bench/server-cfg.sh
View file

@ -200,6 +200,7 @@ sub new
$main::opt_create_options =~ /type=gemini/i)
{
$limits{'working_blobs'} = 0; # Blobs not implemented yet
$limits{'max_tables'} = 500;
}
return $self;

2
sql/field.cc
View file

@ -4122,7 +4122,7 @@ ulonglong Field_blob::get_id(const char *from)
ulonglong id = 0;
ulong length=get_length(from);
if (length)
uint8korr(id, from+packlength);
id=uint8korr(from+packlength);
return id;
}