Commit 479808be authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/r/skip_name_resolve.result:
  Auto merged
mysql-test/t/skip_name_resolve.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
parents d051f628 dbc27a62

include/config-win.h

+5 −0
Original line number Diff line number Diff line
@@ -325,6 +325,11 @@ inline double ulonglong2double(ulonglong value) 
#define HAVE_SETFILEPOINTER

#define HAVE_VIO_READ_BUFF



#ifndef __NT__

#undef FILE_SHARE_DELETE

#define FILE_SHARE_DELETE 0     /* Not implemented on Win 98/ME */

#endif



#ifdef NOT_USED

#define HAVE_SNPRINTF		/* Gave link error */

#define _snprintf snprintf

include/my_pthread.h

+2 −2
Original line number Diff line number Diff line
@@ -643,10 +643,10 @@ extern int pthread_dummy(int); 


#define THREAD_NAME_SIZE 10

#ifndef DEFAULT_THREAD_STACK

#if defined(__ia64__)

#if SIZEOF_CHARP > 4

/*

  MySQL can survive with 32K, but some glibc libraries require > 128K stack

  To resolve hostnames

  To resolve hostnames. Also recursive stored procedures needs stack.

*/

#define DEFAULT_THREAD_STACK	(256*1024L)

#else

mysql-test/r/rpl_relayrotate.result

+0 −3
Original line number Diff line number Diff line
@@ -10,9 +10,6 @@ reset slave; 
start slave;

stop slave;

start slave;

select master_pos_wait('master-bin.001',3000)>=0;

master_pos_wait('master-bin.001',3000)>=0

1

select max(a) from t1;

max(a)

8000

mysql-test/t/mysqltest.test

+2 −2
Original line number Diff line number Diff line
@@ -968,9 +968,9 @@ drop table t1; 


--error 1

--exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out

# The .out file should be empty, cat will fail!

# The .out file should be empty

--error 1

--exec cat $MYSQL_TEST_DIR/var/tmp/bug11731.out

--exec test -s $MYSQL_TEST_DIR/var/tmp/bug11731.out

drop table t1;

mysql-test/t/rpl_deadlock.test

+3 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ while ($1) 
enable_query_log;

select * from t1 for update;

start slave;

--sleep 3 # hope that slave is blocked now

--real_sleep 3 # hope that slave is blocked now

insert into t2 values(22); # provoke deadlock, slave should be victim

commit;

sync_with_master;
@@ -76,7 +76,7 @@ change master to master_log_pos=532; # the BEGIN log event 
begin;

select * from t2 for update; # hold lock

start slave;

--sleep 10 # slave should have blocked, and be retrying

--real_sleep 10 # slave should have blocked, and be retrying

commit;

sync_with_master;

select * from t1; # check that slave succeeded finally
@@ -97,7 +97,7 @@ change master to master_log_pos=532; 
begin;

select * from t2 for update;

start slave;

--sleep 10

--real_sleep 10

commit;

sync_with_master;

select * from t1;