Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


configure.in:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/include/util/OutputStream.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged

5 files changed, 11 insertions, 11 deletions

diff --git a/include/heap.h b/include/heap.h
index 69d1e441a4b..ea02b30e49b 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -46,8 +46,8 @@ typedef struct st_heapinfo		/* Struct from heap_info */
   ulong records;			/* Records in database */
   ulong deleted;			/* Deleted records in database */
   ulong max_records;
-  ulong data_length;
-  ulong index_length;
+  ulonglong data_length;
+  ulonglong index_length;
   uint reclength;			/* Length of one record */
   int errkey;
   ulonglong auto_increment;
@@ -135,7 +135,7 @@ typedef struct st_heap_share
   HP_BLOCK block;
   HP_KEYDEF  *keydef;
   ulong min_records,max_records;	/* Params to open */
-  ulong data_length,index_length,max_table_size;
+  ulonglong data_length,index_length,max_table_size;
   uint key_stat_version;                /* version to indicate insert/delete */
   uint records;				/* records */
   uint blength;				/* records rounded up to 2^n */
@@ -187,7 +187,7 @@ typedef struct st_heap_create_info
 {
   uint auto_key;                        /* keynr [1 - maxkey] for auto key */
   uint auto_key_type;
-  ulong max_table_size;
+  ulonglong max_table_size;
   ulonglong auto_increment;
   my_bool with_auto_increment;
 } HP_CREATE_INFO;
diff --git a/include/my_global.h b/include/my_global.h
index c182ef7b799..80654051b5b 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1136,8 +1136,8 @@ typedef char		bool;	/* Ordinary boolean values 0 1 */
 #define set_timespec_nsec(ABSTIME,NSEC) \
 {\
   ulonglong now= my_getsystime() + (NSEC/100); \
-  (ABSTIME).tv_sec=  (now / ULL(10000000)); \
-  (ABSTIME).tv_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100));    \
+  (ABSTIME).tv_sec=  (time_t) (now / ULL(10000000));                  \
+  (ABSTIME).tv_nsec= (long) (now % ULL(10000000) * 100 + ((NSEC) % 100)); \
 }
 #endif /* !set_timespec_nsec */
 #endif /* HAVE_TIMESPEC_TS_SEC */
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 8a0e1fc2b01..b3d84e70d6a 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -602,14 +602,13 @@ struct st_my_thread_var
 };
 
 extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const));
+extern uint my_thread_end_wait_time;
 #define my_thread_var (_my_thread_var())
 #define my_errno my_thread_var->thr_errno
 /*
   Keep track of shutdown,signal, and main threads so that my_end() will not
   report errors with them
 */
-extern pthread_t shutdown_th, main_th, signal_th;
-
 	/* statistics_xxx functions are for not essential statistic */
 
 #ifndef thread_safe_increment
diff --git a/include/my_tree.h b/include/my_tree.h
index e9746ca1b2c..68a2ea777c0 100644
--- a/include/my_tree.h
+++ b/include/my_tree.h
@@ -51,7 +51,8 @@ typedef struct st_tree_element {
 typedef struct st_tree {
   TREE_ELEMENT *root,null_element;
   TREE_ELEMENT **parents[MAX_TREE_HEIGHT];
-  uint offset_to_key,elements_in_tree,size_of_element,memory_limit,allocated;
+  uint offset_to_key,elements_in_tree,size_of_element;
+  ulong memory_limit, allocated;
   qsort_cmp2 compare;
   void *custom_arg;
   MEM_ROOT mem_root;
@@ -61,7 +62,7 @@ typedef struct st_tree {
 } TREE;
 
 	/* Functions on whole tree */
-void init_tree(TREE *tree, uint default_alloc_size, uint memory_limit,
+void init_tree(TREE *tree, ulong default_alloc_size, ulong memory_limit,
                int size, qsort_cmp2 compare, my_bool with_delete,
 	       tree_element_free free_element, void *custom_arg);
 void delete_tree(TREE*);
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 156d68efdec..7a1e2e30ac7 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -340,7 +340,7 @@ extern "C" {
 my_bool	my_net_init(NET *net, Vio* vio);
 void	my_net_local_init(NET *net);
 void	net_end(NET *net);
-void	net_clear(NET *net);
+  void	net_clear(NET *net, my_bool clear_buffer);
 my_bool net_realloc(NET *net, unsigned long length);
 my_bool	net_flush(NET *net);
 my_bool	my_net_write(NET *net,const char *packet,unsigned long len);