Commit 30209c1d authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Portability fix. 

Fixed linking problem with InnoDB.
parent f9a321af

BUILD/compile-alpha-cxx

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ rm */.deps/* 
make

if [ $? = 0 ]

then

  rm */.deps/*

  find . -name ".deps" | xargs rm -r 

  bin/mysqladmin shutdown

  sur make install

  if [ $? = 0 ]

acinclude.m4

+1 −1
Original line number Diff line number Diff line
@@ -1126,9 +1126,9 @@ dnl circular references. 
 \$(top_builddir)/innobase/usr/libusr.a\

 \$(top_builddir)/innobase/odbc/libodbc.a\

 \$(top_builddir)/innobase/srv/libsrv.a\

 \$(top_builddir)/innobase/dict/libdict.a\

 \$(top_builddir)/innobase/que/libque.a\

 \$(top_builddir)/innobase/srv/libsrv.a\

 \$(top_builddir)/innobase/dict/libdict.a\

 \$(top_builddir)/innobase/ibuf/libibuf.a\

 \$(top_builddir)/innobase/row/librow.a\

 \$(top_builddir)/innobase/pars/libpars.a\

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static String glob_buffer,old_buffer; 
static int wait_time = 5;

static STATUS status;

static ulong select_limit,max_join_size,opt_connect_timeout=0;

char mysql_charsets_dir[FN_REFLEN+1];

static char mysql_charsets_dir[FN_REFLEN+1];

static const char *xmlmeta[] = {

  "&", "&",

  "<", "&lt;",

client/mysqlmanager-pwgen.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ int main(int argc, char** argv) 
    die("Could not open '%s'(errno=%d)",outfile,errno);

  get_pass(pw,sizeof(pw)-1);

  my_MD5Init(&context);

  my_MD5Update(&context,pw,sizeof(pw)-1);

  my_MD5Update(&context,(uchar*) pw,sizeof(pw)-1);

  my_MD5Final(digest,&context);

  fprintf(fp,"%s:",user);

  for (i=0;i<sizeof(digest);i++)

myisam/ft_boolean_search.c

+6 −4
Original line number Diff line number Diff line
@@ -163,13 +163,14 @@ void _ftb_init_index_search(FT_INFO *ftb) 
  {

    ftbw=(FTB_WORD *)(ftb->queue.root[i]);



    r=_mi_search(info, keyinfo, ftbw->word, ftbw->len,

    r=_mi_search(info, keyinfo, (uchar*) ftbw->word, ftbw->len,

                 SEARCH_FIND | SEARCH_PREFIX, keyroot);

    if (!r)

    {

      r=_mi_compare_text(default_charset_info,

                         info->lastkey+ftbw->trunc,ftbw->len-ftbw->trunc,

                         ftbw->word+ftbw->trunc,ftbw->len-ftbw->trunc,0);

                         (uchar*) ftbw->word+ftbw->trunc,ftbw->len-ftbw->trunc,

			 0);

    }

    if (r) /* not found */

    {
@@ -306,13 +307,14 @@ int ft_boolean_read_next(FT_INFO *ftb, char *record) 
      _ftb_climb_the_tree(ftbw, curdoc);



      /* update queue */

      r=_mi_search(info, keyinfo, ftbw->word, USE_WHOLE_KEY,

      r=_mi_search(info, keyinfo, (uchar*) ftbw->word, USE_WHOLE_KEY,

                   SEARCH_BIGGER , keyroot);

      if (!r)

      {

        r=_mi_compare_text(default_charset_info,

                           info->lastkey+ftbw->trunc,ftbw->len-ftbw->trunc,

                           ftbw->word+ftbw->trunc,ftbw->len-ftbw->trunc,0);

                           (uchar*) ftbw->word+ftbw->trunc,

			   ftbw->len-ftbw->trunc,0);

      }

      if (r) /* not found */

      {