Commit 6aa9e3a4 authored by gshchepa/uchum@gleb.loc's avatar gshchepa/uchum@gleb.loc
Browse files

Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  gleb.loc:/home/uchum/work/bk/5.0-opt
parents 87c3d18f 33b64dc9

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -1341,3 +1341,6 @@ win/vs71cache.txt 
win/vs8cache.txt

zlib/*.ds?

zlib/*.vcproj

debian/control

debian/defs.mk

include/abi_check

BUILD/compile-pentium-gcov

+3 −2
Original line number Diff line number Diff line
@@ -13,8 +13,9 @@ export LDFLAGS="-fprofile-arcs -ftest-coverage" 


# The  -fprofile-arcs and -ftest-coverage options cause GCC to instrument the

# code with profiling information used by gcov.

# the -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.

extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM $debug_cflags $max_cflags -DMYSQL_SERVER_SUFFIX=-gcov"

# The -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.

# The -DHAVE_gcov enables code to write out coverage info even when crashing.

extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM $debug_cflags $max_cflags -DMYSQL_SERVER_SUFFIX=-gcov -DHAVE_gcov"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"

include/my_base.h

+6 −1
Original line number Diff line number Diff line
@@ -168,7 +168,12 @@ enum ha_extra_function { 
    These flags are reset by the handler::extra(HA_EXTRA_RESET) call.

  */

  HA_EXTRA_DELETE_CANNOT_BATCH,

  HA_EXTRA_UPDATE_CANNOT_BATCH

  HA_EXTRA_UPDATE_CANNOT_BATCH,

  /*

    Inform handler that an "INSERT...ON DUPLICATE KEY UPDATE" will be

    executed. This condition is unset by HA_EXTRA_NO_IGNORE_DUP_KEY.

  */

  HA_EXTRA_INSERT_WITH_UPDATE

};



	/* The following is parameter to ha_panic() */

libmysql/libmysql.c

+15 −0
Original line number Diff line number Diff line
@@ -168,8 +168,23 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)), 
}





/*

  Free all memory and resources used by the client library



  NOTES

    When calling this there should not be any other threads using

    the library.



    To make things simpler when used with windows dll's (which calls this

    function automaticly), it's safe to call this function multiple times.

*/





void STDCALL mysql_server_end()

{

  if (!mysql_client_init)

    return;



#ifdef EMBEDDED_LIBRARY

  end_embedded_server();

#endif

myisam/ft_parser.c

+4 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end, 


  while (doc<end)

  {

    for (;doc<end;doc++)

    for (; doc < end; doc+= mbl)

    {

      if (true_word_char(cs,*doc)) break;

      if (*doc == FTB_RQUOT && param->quot)
@@ -120,6 +120,7 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end, 
        *start=doc+1;

        return 3; /* FTB_RBR */

      }

      mbl= my_mbcharlen(cs, *(uchar *)doc);

      if (!param->quot)

      {

        if (*doc == FTB_LBR || *doc == FTB_RBR || *doc == FTB_LQUOT)
@@ -187,10 +188,11 @@ byte ft_simple_get_word(CHARSET_INFO *cs, byte **start, const byte *end, 


  do

  {

    for (;; doc++)

    for (;; doc+= mbl)

    {

      if (doc >= end) DBUG_RETURN(0);

      if (true_word_char(cs, *doc)) break;

      mbl= my_mbcharlen(cs, *(uchar *)doc);

    }



    mwc= length= 0;