Commit cddb5f57 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-4.1 

into mysql.com:/home/jimw/my/mysql-4.1-clean
parents 1b46843c 96f9c9d9

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ serg@sergbook.mysql.com 
sergefp@mysql.com

sinisa@rhols221.adsl.netsonic.fi

stewart@mysql.com

svoj@mysql.com

tfr@beta.frontier86.ee

tfr@indrek.tfr.cafe.ee

tfr@sarvik.tfr.cafe.ee

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 4.1.10)

AM_INIT_AUTOMAKE(mysql, 4.1.11)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -16,7 +16,7 @@ SHARED_LIB_VERSION=14:0:0 
# ndb version

NDB_VERSION_MAJOR=4

NDB_VERSION_MINOR=1

NDB_VERSION_BUILD=10

NDB_VERSION_BUILD=11

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

include/config-win.h

+15 −8
Original line number Diff line number Diff line
@@ -31,18 +31,25 @@ functions */ 


#define HAVE_SMEM 1



#if defined(__NT__)

#define SYSTEM_TYPE	"NT"

#elif defined(__WIN2000__)

#define SYSTEM_TYPE	"WIN2000"

#if defined(_WIN64) || defined(WIN64) 

#define SYSTEM_TYPE	"Win64" 

#elif defined(_WIN32) || defined(WIN32) 

#define SYSTEM_TYPE	"Win32" 

#else

#define SYSTEM_TYPE	"Win95/Win98"

#define SYSTEM_TYPE	"Windows"

#endif



#if defined(_WIN64) || defined(WIN64)

#define MACHINE_TYPE	"ia64"		/* Define to machine type name */

#if defined(_M_IA64) 

#define MACHINE_TYPE	"ia64" 

#elif defined(_M_IX86) 

#define MACHINE_TYPE	"ia32" 

#elif defined(_M_ALPHA) 

#define MACHINE_TYPE	"axp" 

#else

#define MACHINE_TYPE	"i32"		/* Define to machine type name */

#define MACHINE_TYPE	"unknown"	/* Define to machine type name */

#endif 

 

#if !(defined(_WIN64) || defined(WIN64)) 

#ifndef _WIN32

#define _WIN32				/* Compatible with old source */

#endif

myisam/ft_boolean_search.c

+14 −22
Original line number Diff line number Diff line
@@ -435,32 +435,24 @@ static int _ftb_strstr(const byte *s0, const byte *e0, 
                const byte *s1, const byte *e1,

                CHARSET_INFO *cs)

{

  const byte *p0, *p1;

  my_bool s_after, e_before;



  s_after=true_word_char(cs, s1[0]);

  e_before=true_word_char(cs, e1[-1]);

  p0=s0;

  const byte *p0= s0;

  my_bool s_after= true_word_char(cs, s1[0]);

  my_bool e_before= true_word_char(cs, e1[-1]);

  uint p0_len;

  my_match_t m[2];



  while (p0 < e0)

  {

    while (p0 < e0 && cs->to_upper[(uint) (uchar) *p0++] !=

           cs->to_upper[(uint) (uchar) *s1])

      /* no-op */;

    if (p0 >= e0)

      return 0;



    if (s_after && p0-1 > s0 && true_word_char(cs, p0[-2]))

      continue;



    p1=s1+1;

    while (p0 < e0 && p1 < e1 && cs->to_upper[(uint) (uchar) *p0] ==

           cs->to_upper[(uint) (uchar) *p1])

      p0++, p1++;

    if (p1 == e1 && (!e_before || p0 == e0 || !true_word_char(cs, p0[0])))

      return 1;

    if (cs->coll->instr(cs, p0, e0 - p0, s1, e1 - s1, m, 2) != 2)

      return(0);

    if ((!s_after || p0 + m[1].beg == s0 || !true_word_char(cs, p0[m[1].beg-1])) &&

        (!e_before || p0 + m[1].end == e0 || !true_word_char(cs, p0[m[1].end])))

      return(1);

    p0+= m[1].beg;

    p0+= (p0_len= my_mbcharlen(cs, *(uchar *)p0)) ? p0_len : 1;

  }

  return 0;



  return(0);

}

mysql-test/r/delete.result

+9 −0
Original line number Diff line number Diff line
@@ -163,3 +163,12 @@ select * from t1; 
a	b

7	7

drop table t1;

CREATE TABLE t1 ( a int PRIMARY KEY );

DELETE FROM t1 WHERE t1.a > 0 ORDER BY t1.a;

INSERT INTO t1 VALUES (0),(1),(2);

DELETE FROM t1 WHERE t1.a > 0 ORDER BY t1.a LIMIT 1;

SELECT * FROM t1;

a

0

2

DROP TABLE t1;