Commit a46f4cf4 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1


sql/field.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/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
parents c01a9fc2 a923940c

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 */

sql/examples/ha_archive.cc

+3 −3
Original line number Diff line number Diff line
@@ -602,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
@@ -619,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;

    }

  }
@@ -790,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

+1 −3
Original line number Diff line number Diff line
@@ -152,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));

sql/examples/ha_tina.cc

+12 −25
Original line number Diff line number Diff line
@@ -343,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++)
@@ -747,29 +746,17 @@ int ha_tina::rnd_end() 
      beginning so that we move the smallest amount of data possible.

    */

    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)))

sql/item_subselect.cc

+0 −3
Original line number Diff line number Diff line
@@ -386,9 +386,6 @@ Item_singlerow_subselect::select_transformer(JOIN *join) 
    return RES_REDUCE;

  }

  return RES_OK;



err:

  return RES_ERROR;

}