Commit 641ac16c authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

parents 89f92db6 a4bc23ad

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line 
Miguel@light.local

monty@hundin.mysql.fi

paul@central.snake.net

Docs/manual.texi

+3 −0
Original line number Diff line number Diff line
@@ -46854,6 +46854,9 @@ not yet 100% confident in this code. 
@appendixsubsec Changes in release 3.23.43

@itemize @bullet

@item

Fixed unlikely bug, which returned not matching rows, in SELECT with

many tables and multi-column indexes and 'range' type.

@item

Fixed a unlikely core-dump bug when doing @code{EXPLAIN SELECT} when using

many tables and @code{ORDER BY}.

@item

acinclude.m4

+1 −1
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ changequote([, ])dnl 
AC_DEFUN(AC_SYS_LARGEFILE,

  [AC_REQUIRE([AC_CANONICAL_HOST])

   AC_ARG_ENABLE(largefile,

     [  --disable-large-files   Omit support for large files])

     [  --disable-largefile    Omit support for large files])

   if test "$enable_largefile" != no; then

     AC_CHECK_TOOL(GETCONF, getconf)

     AC_SYS_LARGEFILE_FLAGS(CFLAGS)

mysql-test/r/join.result

+2 −0
Original line number Diff line number Diff line
@@ -20,3 +20,5 @@ id catid stateid countyid 
a

1

2

a	a	b

2	2	3

mysql-test/r/null_key.result

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ t1 index NULL a 9 NULL 12 where used; Using index 
table	type	possible_keys	key	key_len	ref	rows	Extra

t1	range	a,b	a	9	NULL	3	where used; Using index

table	type	possible_keys	key	key_len	ref	rows	Extra

t1	ref	a,b	b	4	const	2	where used

t1	range	a,b	a	9	NULL	2	where used; Using index

table	type	possible_keys	key	key_len	ref	rows	Extra

t1	ref	a,b	a	5	const	3	where used; Using index

table	type	possible_keys	key	key_len	ref	rows	Extra