Commit 9c71571f authored by unknown's avatar unknown
Browse files

Merge with 4.1 to get fix for memory leak 


client/mysql.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_base.cc:
  merge
parents 50ff7274 f80fa96d

client/mysql.cc

+4 −3
Original line number Diff line number Diff line
@@ -2094,7 +2094,8 @@ print_table_data(MYSQL_RES *result) 
    separator.fill(separator.length()+length+2,'-');

    separator.append('+');

  }

  tee_puts(separator.c_ptr_safe(), PAGER);

  separator.append('\0');                       // End marker for \0

  tee_puts((char*) separator.ptr(), PAGER);

  if (column_names)

  {

    mysql_field_seek(result,0);
@@ -2107,7 +2108,7 @@ print_table_data(MYSQL_RES *result) 
      num_flag[off]= IS_NUM(field->type);

    }

    (void) tee_fputs("\n", PAGER);

    tee_puts(separator.c_ptr(), PAGER);

    tee_puts((char*) separator.ptr(), PAGER);

  }



  while ((cur= mysql_fetch_row(result)))
@@ -2136,7 +2137,7 @@ print_table_data(MYSQL_RES *result) 
    }

    (void) tee_fputs("\n", PAGER);

  }

  tee_puts(separator.c_ptr(), PAGER);

  tee_puts((char*) separator.ptr(), PAGER);

  my_afree((gptr) num_flag);

}

cmd-line-utils/libedit/readline/readline.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ typedef KEYMAP_ENTRY *Keymap; 


#ifndef CTRL

#include <sys/ioctl.h>

#ifdef __GLIBC__

#if defined(__GLIBC__) || defined(__MWERKS__)

#include <sys/ttydefaults.h>

#endif

#ifndef CTRL

sql/item.h

+6 −4
Original line number Diff line number Diff line
@@ -1394,12 +1394,14 @@ class Item_null_helper :public Item_ref_null_helper 
  void print(String *str);

};





/*

  The following class is used to optimize comparing of date and bigint columns

  We need to save the original item, to be able to set the field to the

  original value in 'opt_range'.

  An instance of Item_int_with_ref may refer to a signed or an unsigned

  integer.

  We need to save the original item ('ref') to be able to call

  ref->save_in_field(). This is used to create index search keys.

  

  An instance of Item_int_with_ref may have signed or unsigned integer value.

  

*/



class Item_int_with_ref :public Item_int

sql/sql_base.cc

+2 −2
Original line number Diff line number Diff line
@@ -3306,8 +3306,8 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table, 
                        name->length(), 1)) <=

        0)

    {

      my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0),

               name->c_ptr_safe(), table->s->table_name);

      my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr(),

	       table->real_name);

      map->set_all();

      return 1;

    }