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

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

acinclude.m4

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

sql-bench/server-cfg.sh

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

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