Merging 4.1->5.0.

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
client/mysql.cc:
  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
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.h:
  Auto merged

4 files changed, 62 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 43cacf8fa65..94263892ebd 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 3031b883e98..cc773160b3d 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -130,6 +130,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;
 
@@ -291,6 +293,8 @@ typedef struct st_udf_args
   char **args;				/* Pointer to argument */
   unsigned long *lengths;		/* Length of string arguments */
   char *maybe_null;			/* Set to 1 for all maybe_null args */
+  char **attributes;                    /* Pointer to attribute name */
+  unsigned long *attribute_lengths;     /* Length of attribute arguments */
 } UDF_ARGS;
 
   /* This holds information about the result */
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index a6e23fbff3a..372ddc0787b 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -300,4 +300,36 @@
 #define ER_WARN_QC_RESIZE 1281
 #define ER_BAD_FT_COLUMN 1282
 #define ER_UNKNOWN_KEY_CACHE 1283
-#define ER_ERROR_MESSAGES 284
+#define ER_SP_NO_RECURSIVE_CREATE 1284
+#define ER_SP_ALREADY_EXISTS 1285
+#define ER_SP_DOES_NOT_EXIST 1286
+#define ER_SP_DROP_FAILED 1287
+#define ER_SP_STORE_FAILED 1288
+#define ER_SP_LILABEL_MISMATCH 1289
+#define ER_SP_LABEL_REDEFINE 1290
+#define ER_SP_LABEL_MISMATCH 1291
+#define ER_SP_UNINIT_VAR 1292
+#define ER_SP_BADSELECT 1293
+#define ER_SP_BADRETURN 1294
+#define ER_SP_BADQUERY 1295
+#define ER_UPDATE_LOG_DEPRECATED_IGNORED 1296
+#define ER_UPDATE_LOG_DEPRECATED_TRANSLATED 1297
+#define ER_QUERY_INTERRUPTED 1298
+#define ER_SP_WRONG_NO_OF_ARGS 1299
+#define ER_SP_COND_MISMATCH 1300
+#define ER_SP_NORETURN 1301
+#define ER_SP_NORETURNEND 1302
+#define ER_SP_BAD_CURSOR_QUERY 1303
+#define ER_SP_BAD_CURSOR_SELECT 1304
+#define ER_SP_CURSOR_MISMATCH 1305
+#define ER_SP_CURSOR_ALREADY_OPEN 1306
+#define ER_SP_CURSOR_NOT_OPEN 1307
+#define ER_SP_UNDECLARED_VAR 1308
+#define ER_SP_WRONG_NO_OF_FETCH_ARGS 1309
+#define ER_SP_FETCH_NO_DATA 1310
+#define ER_SP_DUP_PARAM 1311
+#define ER_SP_DUP_VAR 1312
+#define ER_SP_DUP_COND 1313
+#define ER_SP_DUP_CURS 1314
+#define ER_SP_CANT_ALTER 1315
+#define ER_ERROR_MESSAGES 316