Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/my/mysql-4.1

6 files changed, 19 insertions, 9 deletions

diff --git a/sql/filesort.cc b/sql/filesort.cc
index 8699a517661..fc8b529712c 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -349,7 +349,7 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select,
   byte *ref_pos,*next_pos,ref_buff[MAX_REFLENGTH];
   my_off_t record;
   TABLE *sort_form;
-  volatile bool *killed= &current_thd->killed;
+  volatile my_bool *killed= &current_thd->killed;
   handler *file;
   DBUG_ENTER("find_all_keys");
   DBUG_PRINT("info",("using: %s",(select?select->quick?"ranges":"where":"every row")));
@@ -800,8 +800,8 @@ int merge_buffers(SORTPARAM *param, IO_CACHE *from_file,
   BUFFPEK *buffpek,**refpek;
   QUEUE queue;
   qsort2_cmp cmp;
-  volatile bool *killed= &current_thd->killed;
-  bool not_killable;
+  volatile my_bool *killed= &current_thd->killed;
+  my_bool not_killable;
   DBUG_ENTER("merge_buffers");
 
   statistic_increment(filesort_merge_passes, &LOCK_status);
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index feac5c51dce..3c7852c703a 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -89,7 +89,7 @@ static void mi_check_print_msg(MI_CHECK *param,	const char* msg_type,
 
 extern "C" {
 
-volatile bool *killed_ptr(MI_CHECK *param)
+volatile my_bool *killed_ptr(MI_CHECK *param)
 {
   return &(((THD *)(param->thd))->killed);
 }
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 2e4a6b5823a..042f2ecd8e7 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1503,7 +1503,7 @@ void mysql_cb_init()
 }
 
 
-/ *To get the name of the NetWare volume having MySQL data folder */
+/* To get the name of the NetWare volume having MySQL data folder */
 
 static void getvolumename()
 {
@@ -1574,6 +1574,7 @@ static void registerwithneb()
 /*
   Callback for NSS Volume Deactivation event
 */
+
 ulong neb_event_callback(struct EventBlock *eblock)
 {
   EventChangeVolStateEnter_s *voldata;
@@ -1602,7 +1603,7 @@ ulong neb_event_callback(struct EventBlock *eblock)
 
 #define ADMIN_VOL_PATH					"_ADMIN:/Volumes/"
 
-staticvoid getvolumeID(BYTE *volumeName)
+static void getvolumeID(BYTE *volumeName)
 {
   char path[zMAX_FULL_NAME];
   Key_t rootKey= 0, fileKey= 0;
@@ -1610,7 +1611,7 @@ staticvoid getvolumeID(BYTE *volumeName)
   zInfo_s info;
   STATUS status;
 
-  /* Get the  root key */
+  /* Get the root key */
   if ((status= zRootKey(0, &rootKey)) != zOK)
   {
     consoleprintf("\nGetNSSVolumeProperties - Failed to get root key, status: %d\n.", (int) status);
diff --git a/sql/sql_bitmap.h b/sql/sql_bitmap.h
index 0274cd700da..96570c508e6 100644
--- a/sql/sql_bitmap.h
+++ b/sql/sql_bitmap.h
@@ -91,7 +91,16 @@ template <> class Bitmap<64>
   ulonglong map;
 public:
   Bitmap<64>() { }
+#if defined(__NETWARE__)
+  /*
+    Metwork compiler gives error on Bitmap<64>
+    Changed to Bitmap, since in this case also it will proper construct
+    this class
+  */
+  explicit Bitmap(uint prefix_to_set) { set_prefix(prefix_to_set); }
+#else
   explicit Bitmap<64>(uint prefix_to_set) { set_prefix(prefix_to_set); }
+#endif
   void init() { }
   void init(uint prefix_to_set) { set_prefix(prefix_to_set); }
   uint length() const { return 64; }
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 7894cf5fb2c..d787dcabd00 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -808,10 +808,10 @@ public:
   bool	     query_start_used,last_insert_id_used,insert_id_used,rand_used;
   bool	     in_lock_tables,global_read_lock;
   bool       query_error, bootstrap, cleanup_done;
-  bool	     volatile killed;
   bool	     tmp_table_used;
   bool	     charset_is_system_charset, charset_is_collation_connection;
   bool       slow_command;
+  my_bool    volatile killed;
 
   /*
     If we do a purge of binary logs, log index info of the threads
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 5032e9c33f0..5b1b18e80e4 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -190,7 +190,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
   else
 #endif /* EMBEDDED_LIBRARY */
     res= open_and_lock_tables(thd, table_list);
-  if (res)
+  if (res || thd->is_fatal_error)
     DBUG_RETURN(-1);
 
   table= table_list->table;