Commit 75351747 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jimw/my/mysql-5.0-clean


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
sql/log.cc:
  Auto merged
parents 2eabe8f3 12e4d1c8

Build-tools/Do-compile

+4 −2
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ sub find 
sub rm_all

{

  my(@rm_files)=@_;

  my($dir,$current_dir,@files,@dirs);

  my($dir,$current_dir,@files,@dirs,$removed);

  $current_dir = `pwd`; chomp($current_dir);



  foreach $dir (@rm_files)
@@ -835,7 +835,9 @@ sub rm_all 
      }

      if ($#files >= 0)

      {

	system("rm -f " . join(" ",@files)) && abort("Can't remove files from $dir");

	$removed= unlink @files;

	print "rm_all : removed $removed files in $current_dir/$dir\n" if ($opt_debug);

	abort("Can't remove all $#files+1 from $current_dir/$dir, just $removed") if $removed != $#files+1;

      }

      foreach $dir (@dirs)

      {

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

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;

mysql-test/t/select.test

+15 −0
Original line number Diff line number Diff line
@@ -1970,3 +1970,18 @@ SELECT K2C4, K4N4, F2I4 FROM t1 
  WHERE  K2C4 = 'WART' AND (K2C4 = 'WART' OR K4N4 = '0200');



DROP TABLE t1;



#

# Test case for bug 7520: a wrong cost of the index for a BLOB field

#



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;

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



DROP TABLE t1, t2;