summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-09-20 20:22:43 +0300
committermonty@hundin.mysql.fi <>2001-09-20 20:22:43 +0300
commitc55ac34fef7dc6d71f68f5beec04c7f791e94a19 (patch)
tree6764b63a8a246e2b0588271a4fdbb80340230a49
parent1ac9e1e678f2a91efe666605fbae573a451f5a6a (diff)
downloadmariadb-git-c55ac34fef7dc6d71f68f5beec04c7f791e94a19.tar.gz
Some fixes for Gemini
-rw-r--r--acinclude.m43
-rw-r--r--sql-bench/server-cfg.sh1
-rw-r--r--sql/field.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 8fb3e986b11..86eed5e69c7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1008,8 +1008,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
diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh
index a8d992bfdce..b4e134cd2c1 100644
--- a/sql-bench/server-cfg.sh
+++ b/sql-bench/server-cfg.sh
@@ -199,6 +199,7 @@ sub new
$main::opt_create_options =~ /type=gemini/i)
{
$limits{'working_blobs'} = 0; # Blobs not implemented yet
+ $limits{'max_tables'} = 500;
}
return $self;
diff --git a/sql/field.cc b/sql/field.cc
index 01178efbdb1..b34f58439db 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -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;
}