Commit 0ac5fa52 authored by jani@rhols221.adsl.netsonic.fi's avatar jani@rhols221.adsl.netsonic.fi
Browse files

Merge work:/home/bk/mysql-4.0 

into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0
parents ab8851d6 430e9cab

client/mysql.cc

+4 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include <signal.h>

#include <violite.h>



const char *VER= "12.2";

const char *VER= "12.3";



/* Don't try to make a nice table if the data is too big */

#define MAX_COLUMN_LENGTH	     1024
@@ -460,6 +460,9 @@ static struct my_option my_long_options[] = 
  {"character-sets-dir", OPT_CHARSETS_DIR,

   "Directory where character sets are.", (gptr*) &charsets_dir,

   (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"default-character-set", OPT_DEFAULT_CHARSET,

   "Set the default character set.", (gptr*) &default_charset,

   (gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"compress", 'C', "Use compression in server/client protocol.",

   (gptr*) &opt_compress, (gptr*) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,

   0, 0, 0},

myisam/myisamchk.c

+7 −7
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static struct my_option my_long_options[] = 
  {"data-file-length", 'D',

   "Max length of data file (when recreating data-file when it's full).",

   (gptr*) &check_param.max_data_file_length,

   (gptr*) &check_param.max_data_file_length, 0, GET_LONG, REQUIRED_ARG,

   (gptr*) &check_param.max_data_file_length, 0, GET_LL, REQUIRED_ARG,

   0, 0, 0, 0, 0, 0},

  {"extend-check", 'e',

   "Try to recover every possible row from the data file. Normally this will also find a lot of garbage rows; Don't use this option if you are not totally desperate.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -214,7 +214,7 @@ static struct my_option my_long_options[] = 
   GET_LONG, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"set-auto-increment", 'A',

   "Force auto_increment to start at this or higher value. If no value is given, then sets the next auto_increment value to the highest used value for the auto key + 1.", (gptr*) &check_param.auto_increment_value,

   (gptr*) &check_param.auto_increment_value, 0, GET_LONG, OPT_ARG, 0, 0, 0,

   (gptr*) &check_param.auto_increment_value, 0, GET_LL, OPT_ARG, 0, 0, 0,

   0, 0, 0},

  {"set-character-set", OPT_SET_CHARSET,

   "Change the character set used by the index", 0, 0, 0, GET_STR,
@@ -250,7 +250,7 @@ static struct my_option my_long_options[] = 
   0, 0, 0, 0},

  { "key_buffer_size", OPT_KEY_BUFFER_SIZE, "",

    (gptr*) &check_param.use_buffers, (gptr*) &check_param.use_buffers, 0,

    GET_LONG, REQUIRED_ARG, (long) USE_BUFFER_INIT, (long) MALLOC_OVERHEAD,

    GET_LL, REQUIRED_ARG, (long) USE_BUFFER_INIT, (long) MALLOC_OVERHEAD,

    (long) ~0L, (long) MALLOC_OVERHEAD, (long) IO_SIZE, 0}, 

  { "myisam_block_size", OPT_MYISAM_BLOCK_SIZE,  "",

    (gptr*) &opt_myisam_block_size, (gptr*) &opt_myisam_block_size, 0,
@@ -258,22 +258,22 @@ static struct my_option my_long_options[] = 
    MI_MAX_KEY_BLOCK_LENGTH, 0, MI_MIN_KEY_BLOCK_LENGTH, 0}, 

  { "read_buffer_size", OPT_READ_BUFFER_SIZE, "",

    (gptr*) &check_param.read_buffer_length,

    (gptr*) &check_param.read_buffer_length, 0, GET_LONG, REQUIRED_ARG,

    (gptr*) &check_param.read_buffer_length, 0, GET_LL, REQUIRED_ARG,

    (long) READ_BUFFER_INIT, (long) MALLOC_OVERHEAD,

    (long) ~0L, (long) MALLOC_OVERHEAD, (long) 1L, 0}, 

  { "write_buffer_size", OPT_WRITE_BUFFER_SIZE, "",

    (gptr*) &check_param.write_buffer_length,

    (gptr*) &check_param.write_buffer_length, 0, GET_LONG, REQUIRED_ARG, 

    (gptr*) &check_param.write_buffer_length, 0, GET_LL, REQUIRED_ARG, 

    (long) READ_BUFFER_INIT, (long) MALLOC_OVERHEAD,

    (long) ~0L, (long) MALLOC_OVERHEAD, (long) 1L, 0}, 

  { "sort_buffer_size", OPT_SORT_BUFFER_SIZE, "",

    (gptr*) &check_param.sort_buffer_length, 

    (gptr*) &check_param.sort_buffer_length, 0, GET_LONG, REQUIRED_ARG,

    (gptr*) &check_param.sort_buffer_length, 0, GET_LL, REQUIRED_ARG,

    (long) SORT_BUFFER_INIT, (long) (MIN_SORT_BUFFER + MALLOC_OVERHEAD),

    (long) ~0L, (long) MALLOC_OVERHEAD, (long) 1L, 0}, 

  { "sort_key_blocks", OPT_SORT_KEY_BLOCKS, "",

    (gptr*) &check_param.sort_key_blocks,

    (gptr*) &check_param.sort_key_blocks, 0, GET_LONG, REQUIRED_ARG,

    (gptr*) &check_param.sort_key_blocks, 0, GET_LL, REQUIRED_ARG,

    BUFFERS_WHEN_SORTING, 4L, 100L, 0L, 1L, 0},

  { "decode_bits", OPT_DECODE_BITS, "", (gptr*) &decode_bits,

    (gptr*) &decode_bits, 0, GET_LONG, REQUIRED_ARG, 9L, 4L, 17L, 0L, 1L, 0},