Commit 237383f0 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 9732efe7 d0f53297

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,
@@ -408,6 +408,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},
@@ -628,12 +631,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 */

include/config-win.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ functions */ 
#include <io.h>

#include <malloc.h>



#define BIG_TABLES 1

#define HAVE_SMEM 1



#if defined(_WIN64) || defined(WIN64)

libmysql/libmysql.c

+2 −0
Original line number Diff line number Diff line
@@ -4380,6 +4380,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;
@@ -4452,6 +4453,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/mi_write.c

+1 −1
Original line number Diff line number Diff line
@@ -975,7 +975,7 @@ int mi_init_bulk_insert(MI_INFO *info, ulong cache_size, ha_rows rows) 
    DBUG_RETURN(0);



  if (rows && rows*total_keylength < cache_size)

    cache_size=rows;

    cache_size= (ulong)rows;

  else

    cache_size/=total_keylength*16;