Merge paul@work.mysql.com:/home/bk/mysql-4.0

into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.de.texi

@@ -39897,12 +39897,12 @@ gespeichert werden kann.
 
 
 @menu
-* InnoDB Disk i/o::             
+* InnoDB Disk I/O::             
 * InnoDB File space::           
 * InnoDB File Defragmenting::   
 @end menu
 
-@node InnoDB Disk i/o, InnoDB File space, File space management, File space management
+@node InnoDB Disk I/O, InnoDB File space, File space management, File space management
 @c German node Festplatten-Ein- und -Ausgaben bei InnoDB
 @subsubsection Festplatten-Ein- und -Ausgaben
 
@@ -39969,7 +39969,7 @@ Eingelesenwerdens in den Puffer-Pool zu sein scheint. Dann schickt InnoDB
 die verbleibenden Lesevorgänge an das Ein-/Ausgabesystem.
 
 
-@node InnoDB File space, InnoDB File Defragmenting, InnoDB Disk i/o, File space management
+@node InnoDB File space, InnoDB File Defragmenting, InnoDB Disk I/O, File space management
 @c German node Speicherplatz in InnoDB
 @subsubsection Speicherplatzverwaltung
 
@@ -44743,6 +44743,7 @@ wollen. @xref{Threaded clients}.
 * my_init::                     
 * mysql_thread_init::           
 * mysql_thread_end::            
+* mysql_thread_safe::           
 @end menu
 
 @node my_init, mysql_thread_init, C Thread functions, C Thread functions
@@ -44783,7 +44784,7 @@ Diese Funktion wird automatisch von @code{my_init()} und
 
 Keine.
 
-@node mysql_thread_end,  , mysql_thread_init, C Thread functions
+@node mysql_thread_end, mysql_thread_safe, mysql_thread_init, C Thread functions
 @c German node mysql_thread_end()
 @subsubsection @code{mysql_thread_end()}
 
@@ -44803,6 +44804,22 @@ Speicherlecks zu vermeiden.
 
 Keine.
 
+@node mysql_thread_safe,  , mysql_thread_end, C Thread functions
+@c Arjen note: new @node 2002-04-19, please translate text!
+@subsubsection @code{mysql_thread_safe()}
+
+@findex @code{mysql_thread_safe()}
+
+@code{unsigned int mysql_thread_safe(void)}
+
+@subsubheading Description
+
+This function indicates whether the client is compiled as thread safe.
+
+@subsubheading Return Values
+
+1 is the client is thread safe, 0 otherwise.
+
 @node C Embedded Server func, C API problems, C Thread functions, C
 @c German node C-Embedded-Server-Funktionen
 @subsection C-Embedded-Server-Funktionsbeschreibungen

Docs/manual.texi

@@ -498,7 +498,7 @@ We also provide @code{MySQL Server} as a multi-threaded library which you
 can link into your application to get a smaller, faster, easier to manage
 product.
 
-@item There is a lot of contributed MySQL software available.
+@item There is a large amount of contributed MySQL software available.
 
 It is very likely that you will find that your favorite application or
 language already supports the @code{MySQL Database Server}.
@@ -11071,7 +11071,6 @@ It's probably a good idea to install the above patches before trying to
 compile/use MySQL.
 
 @node OS/2, BeOS, Other Unix Notes, Operating System Specific Notes
-
 @subsection OS/2 Notes
 
 MySQL uses quite a few open files. Because of this, you should add
@@ -39129,13 +39128,13 @@ integer that can be stored in the specified integer type.
 @subsection File Space Management and Disk I/O
 
 @menu
-* InnoDB Disk i/o::             Disk I/O
+* InnoDB Disk I/O::             Disk I/O
 * InnoDB File space::           File Space Management
 * InnoDB File Defragmenting::   Defragmenting a Table
 @end menu
 
 
-@node InnoDB Disk i/o, InnoDB File space, File space management, File space management
+@node InnoDB Disk I/O, InnoDB File space, File space management, File space management
 @subsubsection Disk I/O
 
 In disk I/O InnoDB uses asynchronous I/O. On Windows NT
@@ -39197,7 +39196,7 @@ fully read into the buffer pool. Then InnoDB posts the remaining
 reads to the I/O system.
 
 
-@node InnoDB File space, InnoDB File Defragmenting, InnoDB Disk i/o, File space management
+@node InnoDB File space, InnoDB File Defragmenting, InnoDB Disk I/O, File space management
 @subsubsection File Space Management
 
 The data files you define in the configuration file form the tablespace
@@ -43696,6 +43695,7 @@ threaded client. @xref{Threaded clients}.
 * my_init::                     @code{my_init()}
 * mysql_thread_init::           @code{mysql_thread_init()}
 * mysql_thread_end::            @code{mysql_thread_end()}
+* mysql_thread_safe::           @code{mysql_thread_safe()}
 @end menu
 
 @node my_init, mysql_thread_init, C Thread functions, C Thread functions
@@ -43737,7 +43737,7 @@ This is automatically called by @code{my_init()} and @code{mysql_connect()}.
 
 None.
 
-@node mysql_thread_end,  , mysql_thread_init, C Thread functions
+@node mysql_thread_end, mysql_thread_safe, mysql_thread_init, C Thread functions
 @subsubsection @code{mysql_thread_end()}
 
 @findex @code{mysql_thread_end()}
@@ -43756,6 +43756,21 @@ library.  It must be called explicitly to avoid a memory leak.
 
 None.
 
+@node mysql_thread_safe,  , mysql_thread_end, C Thread functions
+@subsubsection @code{mysql_thread_safe()}
+
+@findex @code{mysql_thread_safe()}
+
+@code{unsigned int mysql_thread_safe(void)}
+
+@subsubheading Description
+
+This function indicates whether the client is compiled as thread safe.
+
+@subsubheading Return Values
+
+1 is the client is thread safe, 0 otherwise.
+
 @node C Embedded Server func, C API problems, C Thread functions, C
 @subsection C Embedded Server Function Descriptions
 

sql/slave.cc

@@ -1115,6 +1115,7 @@ static inline int add_relay_log(RELAY_LOG_INFO* rli,LOG_INFO* linfo)
 static bool wait_for_relay_log_space(RELAY_LOG_INFO* rli)
 {
   bool slave_killed;
+  LINT_INIT(slave_killed);
   MASTER_INFO* mi = rli->mi;
   const char* save_proc_info;
   THD* thd = mi->io_thd;
@@ -2579,6 +2580,7 @@ Log_event* next_event(RELAY_LOG_INFO* rli)
 	    goto err;
 	  }
 	  rli->relay_log_pos = 4;
+	  rli->pending=0;
 	  strnmov(rli->relay_log_name,rli->linfo.log_file_name,
 		  sizeof(rli->relay_log_name));
 	  flush_relay_log_info(rli);