Commit bf0562f2 authored by unknown's avatar unknown
Browse files

Merge frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0 

into  frost.snake.net:/private/tmp/merge-5.1


sql/sql_select.cc:
  Auto merged
parents 72ad93a0 e85f42c5

server-tools/instance-manager/options.cc

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static struct my_option my_long_options[] = 
    (gptr *) &Options::port_number, (gptr *) &Options::port_number,

    0, GET_UINT, REQUIRED_ARG, DEFAULT_PORT, 0, 0, 0, 0, 0 },



  { "password-file", OPT_PASSWORD_FILE, "Look for Instane Manager users"

  { "password-file", OPT_PASSWORD_FILE, "Look for Instance Manager users"

                                        " and passwords here.",

    (gptr *) &Options::password_file_name,

    (gptr *) &Options::password_file_name,

sql/sql_select.cc

+1 −2
Original line number Diff line number Diff line
@@ -8056,7 +8056,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type, 
                        bool table_cant_handle_bit_fields,

                        uint convert_blob_length)

{

  Item::Type orig_type;

  Item::Type orig_type= type;

  Item *orig_item;



  if (type != Item::FIELD_ITEM &&
@@ -8066,7 +8066,6 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type, 
  {

    orig_item= item;

    item= item->real_item();

    orig_type= type;

    type= Item::FIELD_ITEM;

  }

  switch (type) {