Commit f629af60 authored by unknown's avatar unknown
Browse files

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
parents 288008ea e2bf6b04

client/mysqladmin.cc

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
	option_wait=1;

    }

    else

      option_wait= ~0;

      option_wait= ~(uint)0;

    break;

  case '?':

  case 'I':					/* Info */

client/sql_string.cc

+2 −1
Original line number Diff line number Diff line
@@ -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>

mysys/raid.cc

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ 
   tonu@mysql.com & monty@mysql.com

*/



#include <my_global.h>



#ifdef USE_PRAGMA_IMPLEMENTATION 

#pragma implementation				// gcc: Class implementation

#endif

sql/examples/ha_archive.cc

+6 −4
Original line number Diff line number Diff line
@@ -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));

}

sql/examples/ha_example.cc

+4 −4
Original line number Diff line number Diff line
@@ -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));