Commit c2092ee9 authored by tsmith@sita.local's avatar tsmith@sita.local
Browse files

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  sita.local:/Users/tsmith/m/bk/maint/50
parents 483bd10d c886138d

.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

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;

mysql-test/r/archive-big.result

0 → 100644
+19 −0
Original line number Diff line number Diff line 
CREATE TABLE t1(a BLOB) ENGINE=ARCHIVE;

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

DROP TABLE t1;