bk commit into 4.1 tree (1.1582)

[krishnaprasadkg]

Below is the list of changes that have just been committed into a local
4.1 repository of kp. When kp 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

ChangeSet
  1.1582 03/08/21 18:49:53 kp@blr-techserv.(none)[kp] +2 -0
  lokesh-changes-to-end_thr_alarm-calls.patch

  sql/mysqld.cc
    1.396 03/08/20 15:13:55 kp@blr-techserv.(none)[kp] +4 -4
    Import patch lokesh-changes-to-end_thr_alarm-calls.patch

  include/thr_alarm.h
    1.15 03/08/20 15:13:55 kp@blr-techserv.(none)[kp] +1 -1
    Import patch lokesh-changes-to-end_thr_alarm-calls.patch

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kp
# Host:	blr-techserv.(none)
# Root:	/home/kp/blr-engrlinux/bk/mysql-4.1_new

--- 1.14/include/thr_alarm.h	Sun Jun  8 21:30:58 2003
+++ 1.15/include/thr_alarm.h	Wed Aug 20 15:13:55 2003
@@ -63,7 +63,7 @@
 #define thr_got_alarm(A) 0 
 #define init_thr_alarm(A)
 #define thr_alarm_kill(A)
-#define end_thr_alarm()
+#define end_thr_alarm(A)
 
 #else
 #if defined(__WIN__)

--- 1.395/sql/mysqld.cc	Thu Aug 21 14:21:48 2003
+++ 1.396/sql/mysqld.cc	Wed Aug 20 15:13:55 2003
@@ -577,7 +577,7 @@
     unix_sock= INVALID_SOCKET;
   }
 #endif
-  end_thr_alarm();			 // Abort old alarms.
+  end_thr_alarm(0);			 // Abort old alarms.
   end_slave();
 
   /* First signal all threads that it's time to die */
@@ -886,7 +886,7 @@
   (void) ha_panic(HA_PANIC_CLOSE);	/* close all tables and logs */
   end_key_cache();
   delete_elements(&key_caches, free_key_cache);
-  end_thr_alarm();			/* Free allocated memory */
+  end_thr_alarm(1);			/* Free allocated memory */
 #ifdef USE_RAID
   end_raid();
 #endif
@@ -2496,14 +2496,14 @@
   if (opt_bootstrap)
   {
     int error=bootstrap(stdin);
-    end_thr_alarm();				// Don't allow alarms
+    end_thr_alarm(1);				// Don't allow alarms
     unireg_abort(error ? 1 : 0);
   }
   if (opt_init_file)
   {
     if (read_init_file(opt_init_file))
     {
-      end_thr_alarm();				// Don't allow alarms
+      end_thr_alarm(1);				// Don't allow alarms
       unireg_abort(1);
     }
   }