Merge of 4.1->5.0. This contained the fixes for GCC 4.0

BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
  Auto merged
BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/sql_string.cc:
  Auto merged
mysys/raid.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_blackhole.cc:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_uniq.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/procedure.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol_cursor.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/sql_map.cc:
  Auto merged
sql/sql_olap.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Merge fix
sql/mysqld.cc:
  Hand merge
sql/opt_range.cc:
  Hand Merge
sql/sql_acl.cc:
  Hand Merge

44 files changed, 112 insertions, 57 deletions

diff --git a/sql/examples/ha_archive.cc b/sql/examples/ha_archive.cc
index f28ba79a00e..4f0cfb91d20 100644
--- a/sql/examples/ha_archive.cc
+++ b/sql/examples/ha_archive.cc
@@ -14,7 +14,9 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#ifdef __GNUC__
+#include <my_global.h>
+
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation
 #endif
 
@@ -600,7 +602,7 @@ int ha_archive::write_row(byte * buf)
   if (!delayed_insert || !bulk_insert)
     share->dirty= TRUE;
 
-  if (written != table->s->reclength)
+  if (written != (z_off_t)table->s->reclength)
     goto error;
   /*
     We should probably mark the table as damagaged if the record is written
@@ -617,7 +619,7 @@ int ha_archive::write_row(byte * buf)
     {
       ((Field_blob*) table->field[*ptr])->get_ptr(&data_ptr);
       written= gzwrite(share->archive_write, data_ptr, (unsigned)size);
-      if (written != size)
+      if (written != (z_off_t)size)
         goto error;
     }
   }
@@ -788,7 +790,7 @@ int ha_archive::rnd_pos(byte * buf, byte *pos)
   statistic_increment(table->in_use->status_var.ha_read_rnd_next_count,
 		      &LOCK_status);
   current_position= my_get_ptr(pos, ref_length);
-  z_off_t seek= gzseek(archive, current_position, SEEK_SET);
+  (void)gzseek(archive, current_position, SEEK_SET);
 
   DBUG_RETURN(get_row(archive, buf));
 }
diff --git a/sql/examples/ha_example.cc b/sql/examples/ha_example.cc
index 562b51878bf..66d1a801333 100644
--- a/sql/examples/ha_example.cc
+++ b/sql/examples/ha_example.cc
@@ -63,7 +63,9 @@
     -Brian
 */
 
-#ifdef __GNUC__
+#include <my_global.h>
+
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation
 #endif
 
@@ -150,10 +152,8 @@ static EXAMPLE_SHARE *get_share(const char *table_name, TABLE *table)
 
   return share;
 
-error2:
-  thr_lock_delete(&share->lock);
-  pthread_mutex_destroy(&share->mutex);
 error:
+  pthread_mutex_destroy(&share->mutex);
   pthread_mutex_unlock(&example_mutex);
   my_free((gptr) share, MYF(0));
 
diff --git a/sql/examples/ha_tina.cc b/sql/examples/ha_tina.cc
index 9ac446587ec..6ca7f67ef66 100644
--- a/sql/examples/ha_tina.cc
+++ b/sql/examples/ha_tina.cc
@@ -20,10 +20,10 @@
   First off, this is a play thing for me, there are a number of things wrong with it:
  *) It was designed for csv and therefor its performance is highly questionable.
  *) Indexes have not been implemented. This is because the files can be traded in
-    and out of the table directory without having to worry about rebuilding anything.
+ and out of the table directory without having to worry about rebuilding anything.
  *) NULLs and "" are treated equally (like a spreadsheet).
  *) There was in the beginning no point to anyone seeing this other then me, so there
-    is a good chance that I haven't quite documented it well.
+ is a good chance that I haven't quite documented it well.
  *) Less design, more "make it work"
 
  Now there are a few cool things with it:
@@ -38,7 +38,9 @@ TODO:
  -Brian
 */
 
-#ifdef __GNUC__
+#include <my_global.h>
+
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation
 #endif
 
@@ -89,12 +91,12 @@ int get_mmap(TINA_SHARE *share, int write)
   {
     if (write)
       share->mapped_file= (byte *)mmap(NULL, share->file_stat.st_size, 
-                                        PROT_READ|PROT_WRITE, MAP_SHARED,
-                                        share->data_file, 0);
+                                       PROT_READ|PROT_WRITE, MAP_SHARED,
+                                       share->data_file, 0);
     else
       share->mapped_file= (byte *)mmap(NULL, share->file_stat.st_size, 
-                                        PROT_READ, MAP_PRIVATE,
-                                        share->data_file, 0);
+                                       PROT_READ, MAP_PRIVATE,
+                                       share->data_file, 0);
     if ((share->mapped_file ==(caddr_t)-1)) 
     {
       /*
@@ -144,9 +146,9 @@ static TINA_SHARE *get_share(const char *table_name, TABLE *table)
   {
     char data_file_name[FN_REFLEN];
     if (!my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),
-                          &share, sizeof(*share),
-                          &tmp_name, length+1,
-                          NullS)) 
+                         &share, sizeof(*share),
+                         &tmp_name, length+1,
+                         NullS)) 
     {
       pthread_mutex_unlock(&tina_mutex);
       return NULL;
@@ -341,7 +343,6 @@ int ha_tina::find_current_row(byte *buf)
 
   for (Field **field=table->field ; *field ; field++)
   {
-    int x;
     buffer.length(0);
     mapped_ptr++; // Increment past the first quote
     for(;mapped_ptr != end_ptr; mapped_ptr++)
@@ -746,28 +747,16 @@ int ha_tina::rnd_end()
     */
     qsort(chain, (size_t)(chain_ptr - chain), sizeof(tina_set), (qsort_cmp)sort_set);
     for (ptr= chain; ptr < chain_ptr; ptr++)
-      printf("Chain %d, %d\n", (int)ptr->begin, (int)ptr->end);
-    for (ptr= chain; ptr < chain_ptr; ptr++)
     {
-      //memmove(share->mapped_file + ptr->begin, share->mapped_file
-      //+ ptr->end, length - (size_t)ptr->end);
       /* We peek a head to see if this is the last chain */
-      printf("Delete %d, %d, %d\n", (int)ptr->begin, (int)ptr->end, (int)length);
       if (ptr+1 == chain_ptr)
-      {
-        printf("Shiftina(end) %d(%d) to %d\n", (int)ptr->end, (int)(length - (size_t)ptr->end), (int)ptr->begin);
         memmove(share->mapped_file + ptr->begin, share->mapped_file + ptr->end,
                 length - (size_t)ptr->end);
-      }
       else
-      {
-        printf("Shifting %d(%d) to %d\n", (int)ptr->end, (int)((ptr++)->begin - (size_t)ptr->end), (int)ptr->begin);
-        memmove(share->mapped_file + ptr->begin, share->mapped_file + ptr->end,
-                (size_t)(ptr++)->begin - (size_t)ptr->end);
-      }
+        memmove((caddr_t)share->mapped_file + ptr->begin, (caddr_t)share->mapped_file + ptr->end,
+                (size_t)((ptr++)->begin - ptr->end));
       length= length - (size_t)(ptr->end - ptr->begin);
     }
-    printf("Buffer %s\n",share->mapped_file);
 
     /* Truncate the file to the new size */
     if (my_chsize(share->data_file, length, 0, MYF(MY_WME)))
@@ -850,7 +839,7 @@ int ha_tina::create(const char *name, TABLE *table_arg, HA_CREATE_INFO *create_i
   DBUG_ENTER("ha_tina::create");
 
   if ((create_file= my_create(fn_format(name_buff,name,"",".CSV",MY_REPLACE_EXT|MY_UNPACK_FILENAME),0,
-                               O_RDWR | O_TRUNC,MYF(MY_WME))) < 0)
+                              O_RDWR | O_TRUNC,MYF(MY_WME))) < 0)
     DBUG_RETURN(-1);
 
   my_close(create_file,MYF(0));
diff --git a/sql/field.cc b/sql/field.cc
index 0c7fed99493..720aca13ad4 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -19,6 +19,8 @@
 ** This file implements classes defined in field.h
 *****************************************************************************/
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index 5942973c732..46f510bb905 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -47,6 +47,8 @@
 */
 
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/ha_blackhole.cc b/sql/ha_blackhole.cc
index 6a841801487..00128d3d3b6 100644
--- a/sql/ha_blackhole.cc
+++ b/sql/ha_blackhole.cc
@@ -15,6 +15,8 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation
 #endif
diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc
index cd655eeb0a9..3581b26a585 100644
--- a/sql/ha_heap.cc
+++ b/sql/ha_heap.cc
@@ -15,6 +15,8 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 7f454f43ae5..1703a405035 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -27,6 +27,8 @@ have disables the InnoDB inlining in this file. */
     in Windows?
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index 1352fd84d9d..3b17512c6c2 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -15,6 +15,8 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc
index 0796ded3ac0..d4dc365a163 100644
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -15,6 +15,8 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 208c97ccd7f..8044d128e44 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -20,6 +20,8 @@
   NDB Cluster
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation                          // gcc: Class implementation
 #endif
diff --git a/sql/handler.cc b/sql/handler.cc
index 965c3d26f49..ffd6fbc5916 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -17,6 +17,8 @@
 
 /* Handler-calling-functions */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/hash_filo.cc b/sql/hash_filo.cc
index ec200768222..34f3cd6b035 100644
--- a/sql/hash_filo.cc
+++ b/sql/hash_filo.cc
@@ -20,6 +20,8 @@
 ** to usage.
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/item.cc b/sql/item.cc
index e3cedf68d90..0db9a56055f 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -15,6 +15,8 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 66f0bf9c395..a7abb5f9be8 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -17,6 +17,8 @@
 
 /* This file defines all compare functions */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/item_func.cc b/sql/item_func.cc
index fd0b2c196fd..3767844e200 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -17,6 +17,8 @@
 
 /* This file defines all numerical functions */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc
index e2b0eb5ce07..3173994f90f 100644
--- a/sql/item_geofunc.cc
+++ b/sql/item_geofunc.cc
@@ -17,6 +17,8 @@
 
 /* This file defines all spatial functions */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index e870fe5aa43..4808159fe98 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -20,6 +20,8 @@
 ** (This shouldn't be needed)
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 4556f60a659..b7aefdd6f2e 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -22,6 +22,8 @@ SUBSELECT TODO:
      (sql_select.h/sql_select.cc)
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
@@ -384,9 +386,6 @@ Item_singlerow_subselect::select_transformer(JOIN *join)
     return RES_REDUCE;
   }
   return RES_OK;
-
-err:
-  return RES_ERROR;
 }
 
 
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index b9f3cc49d64..af3828ab2c6 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -17,6 +17,8 @@
 
 /* Sum functions (COUNT, MIN...) */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 3b6ca48fadd..0f2c9a2907d 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -17,6 +17,8 @@
 
 /* This file defines all time functions */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/item_uniq.cc b/sql/item_uniq.cc
index 8734e671817..f6cf83ebb10 100644
--- a/sql/item_uniq.cc
+++ b/sql/item_uniq.cc
@@ -15,6 +15,9 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* Compability file */
+
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation
 #endif
diff --git a/sql/log_event.cc b/sql/log_event.cc
index e9897607800..d4225b39704 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -16,6 +16,9 @@
 
 
 #ifndef MYSQL_CLIENT
+
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 5479a5466f0..6625696c911 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3478,7 +3478,7 @@ static void bootstrap(FILE *file)
   thd->client_capabilities=0;
   my_net_init(&thd->net,(st_vio*) 0);
   thd->max_client_packet_length= thd->net.max_packet;
-  thd->master_access= ~0;
+  thd->master_access= ~(ulong)0;
   thd->thread_id=thread_id++;
   thread_count++;
 
@@ -5830,7 +5830,6 @@ static void print_version(void)
 	 server_version,SYSTEM_TYPE,MACHINE_TYPE, MYSQL_COMPILATION_COMMENT);
 }
 
-
 static void usage(void)
 {
   if (!(default_charset_info= get_charset_by_csname(default_character_set_name,
diff --git a/sql/opt_range.h b/sql/opt_range.h
index 8d365262334..b639ba6efa7 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -691,7 +691,7 @@ class SQL_SELECT :public Sql_alloc {
   ~SQL_SELECT();
   void cleanup();
   bool check_quick(THD *thd, bool force_quick_range, ha_rows limit)
-  { return test_quick_select(thd, key_map(~0), 0, limit, force_quick_range) < 0; }
+  { return test_quick_select(thd, key_map(~(uint)0), 0, limit, force_quick_range) < 0; }
   inline bool skip_record() { return cond ? cond->val_int() == 0 : 0; }
   int test_quick_select(THD *thd, key_map keys, table_map prev_tables,
 			ha_rows limit, bool force_quick_range=0);
diff --git a/sql/procedure.cc b/sql/procedure.cc
index 554e2cd0565..38a043300bc 100644
--- a/sql/procedure.cc
+++ b/sql/procedure.cc
@@ -17,6 +17,8 @@
 
 /* Procedures (functions with changes output of select) */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/protocol.cc b/sql/protocol.cc
index 57922cdc677..8019f3a123b 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -19,6 +19,8 @@
   The actual communction is handled by the net_xxx functions in net_serv.cc
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/protocol_cursor.cc b/sql/protocol_cursor.cc
index ed2d0b583d0..c38a7cdecae 100644
--- a/sql/protocol_cursor.cc
+++ b/sql/protocol_cursor.cc
@@ -19,6 +19,8 @@
   The actual communction is handled by the net_xxx functions in net_serv.cc
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc
index de4ad83fdbb..0b6e44c0272 100644
--- a/sql/repl_failsafe.cc
+++ b/sql/repl_failsafe.cc
@@ -71,7 +71,7 @@ static int init_failsafe_rpl_thread(THD* thd)
   my_net_init(&thd->net, 0);
   thd->net.read_timeout = slave_net_timeout;
   thd->max_client_packet_length=thd->net.max_packet;
-  thd->master_access= ~0;
+  thd->master_access= ~(ulong)0;
   thd->priv_user = 0;
   pthread_mutex_lock(&LOCK_thread_count);
   thd->thread_id = thread_id++;
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 106fced8e88..5f0db0bd2d5 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -48,6 +48,8 @@
       new attribute.
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/slave.cc b/sql/slave.cc
index 70803c88c3a..60812469671 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -2818,7 +2818,7 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type)
   thd->client_capabilities = 0;
   my_net_init(&thd->net, 0);
   thd->net.read_timeout = slave_net_timeout;
-  thd->master_access= ~0;
+  thd->master_access= ~(ulong)0;
   thd->slave_thread = 1;
   set_slave_thread_options(thd);
   /* 
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 7caece67599..a11871c55dc 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -1104,7 +1104,7 @@ static void acl_insert_db(const char *user, const char *host, const char *db,
 ulong acl_get(const char *host, const char *ip,
               const char *user, const char *db, my_bool db_is_pattern)
 {
-  ulong host_access= ~0, db_access= 0;
+  ulong host_access= ~(ulong)0, db_access= 0;
   uint i,key_length;
   char key[ACL_KEY_LENGTH],*tmp_db,*end;
   acl_entry *entry;
@@ -5064,7 +5064,7 @@ bool mysql_revoke_all(THD *thd,  List <LEX_USER> &list)
     }
 
     if (replace_user_table(thd, tables[0].table,
-                           *lex_user, ~0, 1, 0, 0))
+			   *lex_user, ~(ulong)0, 1, 0, 0))
     {
       result= -1;
       continue;
@@ -5091,7 +5091,7 @@ bool mysql_revoke_all(THD *thd,  List <LEX_USER> &list)
 	if (!strcmp(lex_user->user.str,user) &&
 	    !my_strcasecmp(system_charset_info, lex_user->host.str, host))
 	{
-	  if (!replace_db_table(tables[1].table, acl_db->db, *lex_user, ~0, 1))
+	  if (!replace_db_table(tables[1].table, acl_db->db, *lex_user, ~(ulong)0, 1))
 	  {
 	    /*
 	      Don't increment counter as replace_db_table deleted the
@@ -5125,7 +5125,7 @@ bool mysql_revoke_all(THD *thd,  List <LEX_USER> &list)
 	  if (replace_table_table(thd,grant_table,tables[2].table,*lex_user,
 				  grant_table->db,
 				  grant_table->tname,
-				  ~0, 0, 1))
+				  ~(ulong)0, 0, 1))
 	  {
 	    result= -1;
 	  }
@@ -5141,7 +5141,7 @@ bool mysql_revoke_all(THD *thd,  List <LEX_USER> &list)
 				      columns,
 				      grant_table->db,
 				      grant_table->tname,
-				      ~0, 1))
+				      ~(ulong)0, 1))
 	    {
 	      revoked= 1;
 	      continue;
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc
index 6706cee8e9d..55e6dfb3cbe 100644
--- a/sql/sql_analyse.cc
+++ b/sql/sql_analyse.cc
@@ -23,6 +23,8 @@
 **	 - type set is out of optimization yet
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 438bfdbcb73..862cf940173 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -22,6 +22,8 @@
 **
 *****************************************************************************/
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/sql_crypt.cc b/sql/sql_crypt.cc
index f21a109e95d..eda7f0f6bbb 100644
--- a/sql/sql_crypt.cc
+++ b/sql/sql_crypt.cc
@@ -23,6 +23,8 @@
  needs something like 'ssh'.
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 818c18ff500..8e4456a42a6 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1776,7 +1776,7 @@ bool delayed_insert::handle_inserts(void)
   if (thd.killed || table->s->version != refresh_version)
   {
     thd.killed= THD::KILL_CONNECTION;
-    max_rows= ~0;				// Do as much as possible
+    max_rows= ~(uint)0;				// Do as much as possible
   }
 
   /*
diff --git a/sql/sql_list.cc b/sql/sql_list.cc
index d57a7dfe4e3..485c569f49c 100644
--- a/sql/sql_list.cc
+++ b/sql/sql_list.cc
@@ -15,6 +15,8 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/sql_map.cc b/sql/sql_map.cc
index 9346f3df305..556d37a405c 100644
--- a/sql/sql_map.cc
+++ b/sql/sql_map.cc
@@ -15,6 +15,8 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/sql_olap.cc b/sql/sql_olap.cc
index 831b15cf7ef..b349eda0e2e 100644
--- a/sql/sql_olap.cc
+++ b/sql/sql_olap.cc
@@ -28,6 +28,8 @@
 
 #ifdef DISABLED_UNTIL_REWRITTEN_IN_4_1
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index b1863953e1d..2af9191110c 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -651,7 +651,6 @@ static bool check_mqh(THD *thd, uint check_command)
 {
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   bool error= 0;
-  time_t check_time = thd->start_time ?  thd->start_time : time(NULL);
   USER_CONN *uc=thd->user_connect;
   DBUG_ENTER("check_mqh");
   DBUG_ASSERT(uc != 0);
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index e23d32cca84..dd1cdb60ff9 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -17,6 +17,8 @@
 
 /* mysql_select and join optimization */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
@@ -35,7 +37,7 @@ const char *join_type_str[]={ "UNKNOWN","system","const","eq_ref","ref",
 };
 
 const key_map key_map_empty(0);
-const key_map key_map_full(~0);
+const key_map key_map_full(~(uint)0);
 
 static void optimize_keyuse(JOIN *join, DYNAMIC_ARRAY *keyuse_array);
 static bool make_join_statistics(JOIN *join, TABLE_LIST *leaves, COND *conds,
@@ -5086,7 +5088,7 @@ make_simple_join(JOIN *join,TABLE *tmp_table)
   join_tab->select_cond=0;
   join_tab->quick=0;
   join_tab->type= JT_ALL;			/* Map through all records */
-  join_tab->keys.init(~0);                      /* test everything in quick */
+  join_tab->keys.init(~(uint)0);                /* test everything in quick */
   join_tab->info=0;
   join_tab->on_expr_ref=0;
   join_tab->last_inner= 0;
diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index 51f802e7465..be4354227a5 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -16,11 +16,12 @@
 
 /* This file is originally from the mysql distribution. Coded by monty */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 
-#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include <m_ctype.h>
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index 03d54b60318..7c6e88306d9 100644
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@@ -28,6 +28,8 @@
    dynamic functions, so this shouldn't be a real problem.
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: implement sql_udf.h
 #endif
diff --git a/sql/tztime.cc b/sql/tztime.cc
index 11cdf64de29..a52b9701e8e 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -20,18 +20,20 @@
    (We will refer to this code as to elsie-code further.)
 */
 
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation				// gcc: Class implementation
-#endif
-
 /*
   We should not include mysql_priv.h in mysql_tzinfo_to_sql utility since
   it creates unsolved link dependencies on some platforms.
 */
+
+#include <my_global.h>
+
+#ifdef USE_PRAGMA_IMPLEMENTATION
+#pragma implementation				// gcc: Class implementation
+#endif
+
 #if !defined(TZINFO2SQL) && !defined(TESTTIME)
 #include "mysql_priv.h"
 #else
-#include <my_global.h>
 #include <my_time.h>
 #include "tztime.h"
 #include <my_sys.h>