Commit 72750ad9 authored by unknown's avatar unknown
Browse files

Merge 


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/table.cc:
  SCCS merged
parents 6520c161 53596fa1

BitKeeper/triggers/post-commit

+13 −6
Original line number Diff line number Diff line
@@ -20,14 +20,20 @@ if [ "$BK_STATUS" = OK ] 
then 



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]*\).*$/ BUG#\1/p'`

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

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



if [ "$BUG" = "" ]

then

  TO=dev-public@mysql.com

  BS=""

  BH=""

else

  TO=dev-bugs@mysql.com

  BS=" BUG#$BUG"

# need newline here

  BH="X-Bug: $BUG

"

fi

#++

# dev-public@ / dev-bugs@
@@ -38,8 +44,8 @@ fi 
List-ID: <bk.mysql-$VERSION>

From: $FROM

To: $TO

Subject: bk commit - $VERSION tree ($CHANGESET)${BUG}${WL}



Subject: bk commit - $VERSION tree ($CHANGESET)${BS}${WL}

$BH

EOF

  bk changes -v -r+

  bk cset -r+ -d
@@ -54,14 +60,15 @@ EOF 
List-ID: <bk.mysql-$VERSION>

From: $FROM

To: $INTERNALS

Subject: bk commit into $VERSION tree ($CHANGESET)

Subject: bk commit into $VERSION tree ($CHANGESET)$BS

$BH



Below is the list of changes that have just been committed into a local

$VERSION repository of $USER. When $USER does a push these changes will

be propagated to the main repository and, within 24 hours after the

push, to the public repository.

For information on how to access the public repository

see http://www.mysql.com/doc/I/n/Installing_source_tree.html

see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html



EOF

  bk changes -v -r+
@@ -81,7 +88,7 @@ EOF 
List-ID: <bk.mysql-$VERSION>

From: $FROM

To: $DOCS

Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)

Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)$BS



EOF

  bk changes -v -r+

VC++Files/tests/mysql_client_test.dsp

+6 −6
Original line number Diff line number Diff line
@@ -66,18 +66,18 @@ LINK32=link.exe 
# PROP Output_Dir ".\Release"

# PROP Intermediate_Dir ".\Release"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/client_test.pch" /Fo".\Release/" /Fd".\Release/" /c /GX 

# ADD CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/client_test.pch" /Fo".\Release/" /Fd".\Release/" /c /GX 

# ADD BASE MTL /nologo /tlb".\Release\client_test.tlb" /win32 

# ADD MTL /nologo /tlb".\Release\client_test.tlb" /win32 

# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/mysql_client_test.pch" /Fo".\Release/" /Fd".\Release/" /c /GX 

# ADD CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/mysql_client_test.pch" /Fo".\Release/" /Fd".\Release/" /c /GX 

# ADD BASE MTL /nologo /tlb".\Release\mysql_client_test.tlb" /win32 

# ADD MTL /nologo /tlb".\Release\mysql_client_test.tlb" /win32 

# ADD BASE RSC /l 1033 

# ADD RSC /l 1033 

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo 

# ADD BSC32 /nologo 

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\tests\client_test.exe" /incremental:no /pdb:".\Release\client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\tests\client_test.exe" /incremental:no /pdb:".\Release\client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\tests\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\tests\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 



!ENDIF

extra/replace.c

+13 −13
Original line number Diff line number Diff line
@@ -376,8 +376,8 @@ static REP_SET *make_new_set(REP_SETS *sets); 
static void make_sets_invisible(REP_SETS *sets);

static void free_last_set(REP_SETS *sets);

static void free_sets(REP_SETS *sets);

static void set_bit(REP_SET *set, uint bit);

static void clear_bit(REP_SET *set, uint bit);

static void internal_set_bit(REP_SET *set, uint bit);

static void internal_clear_bit(REP_SET *set, uint bit);

static void or_bits(REP_SET *to,REP_SET *from);

static void copy_bits(REP_SET *to,REP_SET *from);

static int cmp_bits(REP_SET *set1,REP_SET *set2);
@@ -454,7 +454,7 @@ REPLACE *init_replace(my_string *from, my_string *to,uint count, 
  {

    if (from[i][0] == '\\' && from[i][1] == '^')

    {

      set_bit(start_states,states+1);

      internal_set_bit(start_states,states+1);

      if (!from[i][2])

      {

	start_states->table_offset=i;
@@ -463,8 +463,8 @@ REPLACE *init_replace(my_string *from, my_string *to,uint count, 
    }

    else if (from[i][0] == '\\' && from[i][1] == '$')

    {

      set_bit(start_states,states);

      set_bit(word_states,states);

      internal_set_bit(start_states,states);

      internal_set_bit(word_states,states);

      if (!from[i][2] && start_states->table_offset == (uint) ~0)

      {

	start_states->table_offset=i;
@@ -473,11 +473,11 @@ REPLACE *init_replace(my_string *from, my_string *to,uint count, 
    }

    else

    {

      set_bit(word_states,states);

      internal_set_bit(word_states,states);

      if (from[i][0] == '\\' && (from[i][1] == 'b' && from[i][2]))

	set_bit(start_states,states+1);

	internal_set_bit(start_states,states+1);

      else

	set_bit(start_states,states);

	internal_set_bit(start_states,states);

    }

    for (pos=from[i], len=0; *pos ; pos++)

    {
@@ -583,9 +583,9 @@ REPLACE *init_replace(my_string *from, my_string *to,uint count, 
		follow[i].len > found_end)

	      found_end=follow[i].len;

	    if (chr && follow[i].chr)

	      set_bit(new_set,i+1);		/* To next set */

	      internal_set_bit(new_set,i+1);		/* To next set */

	    else

	      set_bit(new_set,i);

	      internal_set_bit(new_set,i);

	  }

	}

	if (found_end)
@@ -602,7 +602,7 @@ REPLACE *init_replace(my_string *from, my_string *to,uint count, 
	    if (follow[bit_nr-1].len < found_end ||

		(new_set->found_len &&

		 (chr == 0 || !follow[bit_nr].chr)))

	      clear_bit(new_set,i);

	      internal_clear_bit(new_set,i);

	    else

	    {

	      if (chr == 0 || !follow[bit_nr].chr)
@@ -751,13 +751,13 @@ static void free_sets(REP_SETS *sets) 
  return;

}



static void set_bit(REP_SET *set, uint bit)

static void internal_set_bit(REP_SET *set, uint bit)

{

  set->bits[bit / WORD_BIT] |= 1 << (bit % WORD_BIT);

  return;

}



static void clear_bit(REP_SET *set, uint bit)

static void internal_clear_bit(REP_SET *set, uint bit)

{

  set->bits[bit / WORD_BIT] &= ~ (1 << (bit % WORD_BIT));

  return;

include/my_pthread.h

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ extern int pthread_dummy(int); 
  MySQL can survive with 32K, but some glibc libraries require > 128K stack

  To resolve hostnames

*/

#define DEFAULT_THREAD_STACK	(192*1024L)

#define DEFAULT_THREAD_STACK	(256*1024L)

#else

#define DEFAULT_THREAD_STACK	(192*1024)

#endif

mysql-test/r/select.result

+13 −0
Original line number Diff line number Diff line
@@ -2388,3 +2388,16 @@ WART 0100 1 
WART	0200	1

WART	0300	3

DROP TABLE t1;

CREATE TABLE t1 ( a BLOB, INDEX (a(20)) );

CREATE TABLE t2 ( a BLOB, INDEX (a(20)) );

INSERT INTO t1 VALUES ('one'),('two'),('three'),('four'),('five');

INSERT INTO t2 VALUES ('one'),('two'),('three'),('four'),('five');

EXPLAIN SELECT * FROM t1 LEFT JOIN t2 USE INDEX (a) ON t1.a=t2.a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	

1	SIMPLE	t2	ref	a	a	23	test.t1.a	2	

EXPLAIN SELECT * FROM t1 LEFT JOIN t2 FORCE INDEX (a) ON t1.a=t2.a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	

1	SIMPLE	t2	ref	a	a	23	test.t1.a	2	

DROP TABLE t1, t2;