Commit 20ec6605 authored by gluh@eagle.(none)'s avatar gluh@eagle.(none)
Browse files

Merge mysql.com:/home/gluh/MySQL/Merge/5.0 

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
parents 82767a0a a5e7b726

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -51,5 +51,5 @@ enum options_client 
  OPT_TRIGGERS,

  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,

  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_SSL_VERIFY_SERVER_CERT,

  OPT_DEBUG_INFO, OPT_ERROR_LOG_FILE

  OPT_DEBUG_INFO, OPT_ERROR_LOG_FILE, OPT_DUMP_DATE

};

client/mysqldump.c

+13 −5
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static my_bool verbose= 0, opt_no_create_info= 0, opt_no_data= 0, 
                opt_drop=1,opt_keywords=0,opt_lock=1,opt_compress=0,

                opt_delayed=0,create_options=1,opt_quoted=0,opt_databases=0,

                opt_alldbs=0,opt_create_db=0,opt_lock_all_tables=0,

                opt_set_charset=0,

                opt_set_charset=0, opt_dump_date=1,

                opt_autocommit=0,opt_disable_keys=1,opt_xml=0,

                opt_delete_master_logs=0, tty_password=0,

                opt_single_transaction=0, opt_comments= 0, opt_compact= 0,
@@ -402,6 +402,9 @@ static struct my_option my_long_options[] = 
   "automatically turns off --lock-tables.",

   (gptr*) &opt_single_transaction, (gptr*) &opt_single_transaction, 0,

   GET_BOOL, NO_ARG,  0, 0, 0, 0, 0, 0},

  {"dump-date", OPT_DUMP_DATE, "Put a dump date to the end of the output.",

   (gptr*) &opt_dump_date, (gptr*) &opt_dump_date, 0,

   GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},

  {"skip-opt", OPT_SKIP_OPTIMIZATION,

   "Disable --opt. Disables --add-drop-table, --add-locks, --create-options, --quick, --extended-insert, --lock-tables, --set-charset, and --disable-keys.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -622,12 +625,17 @@ static void write_footer(FILE *sql_file) 
            "/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;\n");

    fputs("\n", sql_file);

    if (opt_comments)

    {

      if (opt_dump_date)

      {

        char time_str[20];

        get_date(time_str, GETDATE_DATE_TIME, 0);

        fprintf(sql_file, "-- Dump completed on %s\n",

                time_str);

      }

      else

        fprintf(sql_file, "-- Dump completed\n");

    }

    check_io(sql_file);

  }

} /* write_footer */

libmysql/libmysql.c

+2 −0
Original line number Diff line number Diff line
@@ -4355,6 +4355,7 @@ static my_bool setup_one_fetch_function(MYSQL_BIND *param, MYSQL_FIELD *field) 
  case MYSQL_TYPE_STRING:

  case MYSQL_TYPE_DECIMAL:

  case MYSQL_TYPE_NEWDECIMAL:

  case MYSQL_TYPE_NEWDATE:

    DBUG_ASSERT(param->buffer_length != 0);

    param->fetch_result= fetch_result_str;

    break;
@@ -4427,6 +4428,7 @@ static my_bool setup_one_fetch_function(MYSQL_BIND *param, MYSQL_FIELD *field) 
  case MYSQL_TYPE_VAR_STRING:

  case MYSQL_TYPE_STRING:

  case MYSQL_TYPE_BIT:

  case MYSQL_TYPE_NEWDATE:

    param->skip_result= skip_result_string;

    break;

  default:

myisam/rt_index.c

+5 −13
Original line number Diff line number Diff line
@@ -483,15 +483,16 @@ static uchar *rtree_pick_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key, 
			     uint key_length, uchar *page_buf, uint nod_flag)

{

  double increase;

  double best_incr = DBL_MAX;

  double best_incr;

  double area;

  double best_area;

  uchar *best_key;

  uchar *best_key= NULL;

  uchar *k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);

  uchar *last = rt_PAGE_END(page_buf);



  LINT_INIT(best_area);

  LINT_INIT(best_key);

  LINT_INIT(best_incr);



  for (; k < last; k = rt_PAGE_NEXT_KEY(k, key_length, nod_flag))

  {
@@ -500,22 +501,13 @@ static uchar *rtree_pick_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key, 
                                        &area)) == -1.0)

      return NULL;

    /* The following should be safe, even if we compare doubles */

    if (increase < best_incr)

    if (!best_key || increase < best_incr ||

        ((increase == best_incr) && (area < best_area)))

    {

      best_key = k;

      best_area = area;

      best_incr = increase;

    }

    else

    {

      /* The following should be safe, even if we compare doubles */

      if ((increase == best_incr) && (area < best_area))

      {

        best_key = k;

        best_area = area;

        best_incr = increase;

      }

    }

  }

  return best_key;

}

myisam/rt_mbr.c

+4 −1
Original line number Diff line number Diff line
@@ -524,6 +524,9 @@ double rtree_overlapping_area(HA_KEYSEG *keyseg, uchar* a, uchar* b, 


/*

  Calculates MBR_AREA(a+b) - MBR_AREA(a)

  Note: when 'a' and 'b' objects are far from each other,

  the area increase can be really big, so this function

  can return 'inf' as a result.

*/

double rtree_area_increase(HA_KEYSEG *keyseg, uchar* a, uchar* b, 

                          uint key_length, double *ab_area)