Merge work.mysql.com:/home/bk/mysql

into work.mysql.com:/d1/users/tim/my/work

4 files changed, 44 insertions, 10 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/my_sys.h b/include/my_sys.h
index 0f010fc71af..a3cb11fc515 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -41,13 +41,6 @@ extern int NEAR my_errno;		/* Last error in mysys */
 
 #include <stdarg.h>  
 
-#ifdef __EMX__
-/* record loging flags (F_GETLK, F_SETLK, F_SETLKW) */
-#define F_RDLCK     1           /* FreeBSD: shared or read lock */
-#define F_UNLCK     2           /* FreeBSD: unlock */
-#define F_WRLCK     3           /* FreeBSD: exclusive or write lock */
-#endif
-
 #define MYSYS_PROGRAM_USES_CURSES()  { error_handler_hook = my_message_curses;	mysys_uses_curses=1; }
 #define MYSYS_PROGRAM_DONT_USE_CURSES()  { error_handler_hook = my_message_no_curses; mysys_uses_curses=0;}
 #define MY_INIT(name);		{ my_progname= name; my_init(); }
@@ -425,7 +418,7 @@ extern int my_printf_error _VARARGS((uint my_err, const char *format,
 				    __attribute__ ((format (printf, 2, 4))));
 extern int my_vsnprintf( char *str, size_t n,
                                 const char *format, va_list ap );
-
+extern int my_snprintf(char* to, size_t n, const char* fmt, ...);
 extern int my_message(uint my_err, const char *str,myf MyFlags);
 extern int my_message_no_curses(uint my_err, const char *str,myf MyFlags);
 extern int my_message_curses(uint my_err, const char *str,myf MyFlags);
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index 0391c3e6c4e..c84b0c08c77 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -198,4 +198,9 @@
 #define ER_CRASHED_ON_REPAIR 1195
 #define ER_WARNING_NOT_COMPLETE_ROLLBACK 1196
 #define ER_TRANS_CACHE_FULL 1197
-#define ER_ERROR_MESSAGES 198
+#define ER_SLAVE_MUST_STOP 1198
+#define ER_SLAVE_NOT_RUNNING 1199
+#define ER_BAD_SLAVE 1200
+#define ER_MASTER_INFO 1201
+#define ER_SLAVE_THREAD 1202
+#define ER_ERROR_MESSAGES 203
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 */