Commit 6a0e1def authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-4.0 

into mysql.com:/home/bk/b8412-mysql-4.0
parents 8a8d4764 41a329f9

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ bk@admin.bk 
brian@brian-akers-computer.local

carsten@tsort.bitbybit.dk

davida@isil.mysql.com

dean@mysql.com

dellis@goetia.(none)

dlenev@brandersnatch.localdomain

dlenev@build.mysql.com

BitKeeper/triggers/post-commit

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,13 @@ BK_STATUS=$BK_STATUS$BK_COMMIT 
if [ "$BK_STATUS" = OK ]

then 



HAS_ACTUAL_CHANGES=`bk cset -r+ -d | grep -v "^#"`

if [ "$HAS_ACTUAL_CHANGES" = "" ]

then

  echo ChangeSet had no real changes, not sending emails

  exit

fi



CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`

BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/\1/p'`

include/config-win.h

+15 −8
Original line number Diff line number Diff line
@@ -23,18 +23,25 @@ 
#include <io.h>

#include <malloc.h>



#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_nlq_search.c

+6 −1
Original line number Diff line number Diff line
@@ -205,6 +205,10 @@ FT_INFO *ft_init_nlq_search(MI_INFO *info, uint keynr, byte *query, 
		left_root_right))

    goto err2;



  /*

    If ndocs == 0, this will not allocate RAM for FT_INFO.doc[],

    so if ndocs == 0, FT_INFO.doc[] must not be accessed.

   */

  dlist=(FT_INFO *)my_malloc(sizeof(FT_INFO)+

			     sizeof(FT_DOC)*(aio.dtree.elements_in_tree-1),

			     MYF(0));
@@ -275,7 +279,8 @@ float ft_nlq_find_relevance(FT_INFO *handler, 
    else

      a=c;

  }

  if (docs[a].dpos == docid)

  /* bounds check to avoid accessing unallocated handler->doc  */

  if (a < handler->ndocs && docs[a].dpos == docid)

    return (float) docs[a].weight;

  else

    return 0.0;

mysql-test/r/delete.result

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

1	apple

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;