Commit ccafae43 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/my/mysql-5.0


sql/sql_select.cc:
  Auto merged
parents 648b072d 027c10f3

myisam/rt_split.c

+9 −11
Original line number Diff line number Diff line
@@ -258,16 +258,15 @@ int rtree_split_page(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *page, uchar *key, 
  uchar *source_cur, *cur1, *cur2;

  uchar *new_page;

  int err_code= 0;



  uint nod_flag= mi_test_if_nod(page);

  uint full_length= key_length + (nod_flag ? nod_flag : 

                                  info->s->base.rec_reflength);



  int max_keys= (mi_getint(page)-2) / (full_length);



  n_dim = keyinfo->keysegs / 2;

  

  if (!(coord_buf= my_alloca(n_dim * 2 * sizeof(double) * (max_keys + 1 + 4) +

  if (!(coord_buf= (double*) my_alloca(n_dim * 2 * sizeof(double) *

                                       (max_keys + 1 + 4) +

                                       sizeof(SplitStruct) * (max_keys + 1))))

    return -1;
@@ -311,8 +310,7 @@ int rtree_split_page(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *page, uchar *key, 
  cur1 = rt_PAGE_FIRST_KEY(page, nod_flag);

  cur2 = rt_PAGE_FIRST_KEY(new_page, nod_flag);



  n1 = 0;

  n2 = 0;

  n1= n2 = 0;

  for (cur = task; cur < stop; ++cur)

  {

    uchar *to;

ndb/src/ndbapi/Ndb.cpp

+2 −1
Original line number Diff line number Diff line
@@ -230,9 +230,10 @@ Remark: Disconnect all connections to the database. 
void 

Ndb::doDisconnect()

{

  DBUG_ENTER("Ndb::doDisconnect");

  NdbTransaction* tNdbCon;

  CHECK_STATUS_MACRO_VOID;

  /* DBUG_ENTER must be after CHECK_STATUS_MACRO_VOID because of 'return' */

  DBUG_ENTER("Ndb::doDisconnect");



  Uint32 tNoOfDbNodes = theImpl->theNoOfDBnodes;

  Uint8 *theDBnodes= theImpl->theDBnodes;

sql/field_conv.cc

+5 −1
Original line number Diff line number Diff line
@@ -605,6 +605,10 @@ void field_conv(Field *to,Field *from) 
         to->type() != FIELD_TYPE_DATE &&

         to->type() != FIELD_TYPE_DATETIME))

    {						// Identical fields

#ifdef HAVE_purify

      /* This may happen if one does 'UPDATE ... SET x=x' */

      if (to->ptr != from->ptr)

#endif

        memcpy(to->ptr,from->ptr,to->pack_length());

      return;

    }

sql/item_sum.cc

+2 −7
Original line number Diff line number Diff line
@@ -584,13 +584,8 @@ bool Item_sum_distinct::setup(THD *thd) 
{

  List<create_field> field_list;

  create_field field_def;                              /* field definition */



  DBUG_ENTER("Item_sum_distinct::setup");



  /*

    Setup can be called twice for ROLLUP items. This is a bug.

    Please add DBUG_ASSERT(tree == 0) here when it's fixed.

  */

  DBUG_ASSERT(tree == 0);



  /*

    Virtual table and the tree are created anew on each re-execution of

sql/sql_delete.cc

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, 
  {

    my_error(ER_VIEW_DELETE_MERGE_VIEW, MYF(0),

	     table_list->view_db.str, table_list->view_name.str);

    DBUG_RETURN(-1);

    DBUG_RETURN(TRUE);

  }

  table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);

  thd->proc_info="init";