Merge 4.1 into 5.0

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/insert.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/my_pthread.c:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

4 files changed, 44 insertions, 3 deletions

diff --git a/include/config-netware.h b/include/config-netware.h
index dab365a7127..6a7f6291e26 100644
--- a/include/config-netware.h
+++ b/include/config-netware.h
@@ -14,7 +14,10 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-/* Defines for netware compatible with MySQL */
+/* Header for NetWare compatible with MySQL */
+
+#ifndef _config_netware_h
+#define _config_netware_h
 
 /* required headers */
 #include <unistd.h>
@@ -32,6 +35,10 @@
 #include <pthread.h>
 #include <termios.h>
 
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
 /* required adjustments */
 #undef HAVE_READDIR_R
 #undef HAVE_RWLOCK_INIT
@@ -80,6 +87,15 @@
 /* do not use the extended time in LibC sys\stat.h */
 #define _POSIX_SOURCE
 
-/* Some macros for portability */
+/* kernal call on NetWare that will only yield if our time slice is up */
+void kYieldIfTimeSliceUp(void);
 
+/* some macros for portability */
 #define set_timespec(ABSTIME,SEC) { (ABSTIME).tv_sec=(SEC); (ABSTIME).tv_nsec=0; }
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* _config_netware_h */
+
diff --git a/include/my_global.h b/include/my_global.h
index 0e576730ca3..eeb231f9423 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -73,6 +73,13 @@
 #endif
 #endif /* _WIN32... */
 
+/* extra protection against CPU Hogs on NetWare */
+#ifdef __NETWARE__
+  #define NETWARE_YIELD { kYieldIfTimeSliceUp(); }
+#else
+  #define NETWARE_YIELD { }
+#endif
+
 /*
   The macros below are borrowed from include/linux/compiler.h in the
   Linux kernel. Use them to indicate the likelyhood of the truthfulness
diff --git a/include/mysql_com.h b/include/mysql_com.h
index b1c94e5c735..cd850aa5e0a 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -123,6 +123,8 @@ enum enum_server_command
 #define NET_WRITE_TIMEOUT	60		/* Timeout on write */
 #define NET_WAIT_TIMEOUT	8*60*60		/* Wait for new query */
 
+#define ONLY_KILL_QUERY         1
+
 struct st_vio;					/* Only C */
 typedef struct st_vio Vio;
 
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index d2240b7a28e..aabd04bcae8 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -289,4 +289,20 @@
 #define ER_CANT_AGGREGATE_NCOLLATIONS 1270
 #define ER_VARIABLE_IS_NOT_STRUCT 1271
 #define ER_UNKNOWN_COLLATION 1272
-#define ER_ERROR_MESSAGES 273
+#define ER_SP_NO_RECURSIVE_CREATE 1273
+#define ER_SP_ALREADY_EXISTS 1274
+#define ER_SP_DOES_NOT_EXIST 1275
+#define ER_SP_DROP_FAILED 1276
+#define ER_SP_STORE_FAILED 1277
+#define ER_SP_LILABEL_MISMATCH 1278
+#define ER_SP_LABEL_REDEFINE 1279
+#define ER_SP_LABEL_MISMATCH 1280
+#define ER_SP_UNINIT_VAR 1281
+#define ER_SP_BADSELECT 1282
+#define ER_SP_BADRETURN 1283
+#define ER_SP_BADQUERY 1284
+#define ER_UPDATE_LOG_DEPRECATED_IGNORED 1285
+#define ER_UPDATE_LOG_DEPRECATED_TRANSLATED 1286
+#define ER_QUERY_INTERRUPTED 1287
+#define ER_SP_WRONG_NO_OF_ARGS 1288
+#define ER_ERROR_MESSAGES 289