merge

myisam/mi_check.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged

2 files changed, 37 insertions, 1 deletions

diff --git a/include/my_bitmap.h b/include/my_bitmap.h
new file mode 100644
index 00000000000..6c86a79fe45
--- /dev/null
+++ b/include/my_bitmap.h
@@ -0,0 +1,35 @@
+/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+   
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA */
+
+#ifndef _my_bitmap_h_
+#define _my_bitmap_h_
+
+#define MY_BIT_NONE ~(uint)0
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+  extern void bitmap_set_bit(uchar *bitmap, uint bitmap_size, uint bitmap_bit);
+  extern uint bitmap_set_next(uchar *bitmap, uint bitmap_size);
+  extern void bitmap_clear_bit(uchar *bitmap,uint bitmap_size,uint bitmap_bit);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif
diff --git a/include/thr_lock.h b/include/thr_lock.h
index 569a09d7aa5..ffcad4a4d11 100644
--- a/include/thr_lock.h
+++ b/include/thr_lock.h
@@ -27,7 +27,8 @@ extern "C" {
 #include <my_list.h>
 
 struct st_thr_lock;
-
+extern ulong locks_immediate,locks_waited ;
+  
 enum thr_lock_type { TL_IGNORE=-1,
 		     TL_UNLOCK,			/* UNLOCK ANY LOCK */
 		     TL_READ,			/* Read lock */