Commit 10a0b7b9 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/M51/merge-5.1 into mysql.com:/M51/mysql-5.1

parents 9e2e0638 4234038b

client/mysqlslap.c

+20 −19
Original line number Diff line number Diff line
@@ -359,6 +359,8 @@ int main(int argc, char **argv) 


static struct my_option my_long_options[] =

{

  {"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG, NO_ARG,

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

  {"auto-generate-sql", 'a',

    "Generate SQL where not supplied by file or command line.",

    (gptr*) &auto_generate_sql, (gptr*) &auto_generate_sql,
@@ -375,7 +377,8 @@ static struct my_option my_long_options[] = 
  {"create-schema", OPT_CREATE_SLAP_SCHEMA, "Schema to run tests in.",

    (gptr*) &create_schema_string, (gptr*) &create_schema_string, 0, GET_STR, 

    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"csv", OPT_CREATE_SLAP_SCHEMA, "Schema to run tests in.",

  {"csv", OPT_CREATE_SLAP_SCHEMA,

	"Generate CSV output to named file or to stdout if no file is named.",

    (gptr*) &opt_csv_str, (gptr*) &opt_csv_str, 0, GET_STR, 

    OPT_ARG, 0, 0, 0, 0, 0, 0},

  {"debug", '#', "Output debug log. Often this is 'd:t:o,filename'.",
@@ -388,8 +391,6 @@ static struct my_option my_long_options[] = 
  {"engine", 'e', "Storage engine to use for creating the table.",

    (gptr*) &default_engine, (gptr*) &default_engine, 0,

    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG, NO_ARG,

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

  {"host", 'h', "Connect to host.", (gptr*) &host, (gptr*) &host, 0, GET_STR,

    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"iterations", 'i', "Number of times too run the tests.", (gptr*) &iterations,
@@ -402,28 +403,28 @@ static struct my_option my_long_options[] = 
    (gptr*) &num_char_cols, (gptr*) &num_char_cols, 0, GET_UINT, REQUIRED_ARG,

    1, 0, 0, 0, 0, 0},

  {"number-int-cols", 'y', 

    "Number of VARCHAR columns to create table with if specifying \

      --sql-generate-sql.", (gptr*) &num_int_cols, (gptr*) &num_int_cols, 0,

    "Number of VARCHAR columns to create table with if specifying "

      "--sql-generate-sql.", (gptr*) &num_int_cols, (gptr*) &num_int_cols, 0,

    GET_UINT, REQUIRED_ARG, 1, 0, 0, 0, 0, 0},

  {"number-of-query", OPT_MYSQL_NUMBER_OF_QUERY, 

  {"number-of-queries", OPT_MYSQL_NUMBER_OF_QUERY, 

    "Limit each client to this number of queries (this is not exact).",

    (gptr*) &num_of_query, (gptr*) &num_of_query, 0,

    GET_ULL, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"only-print", OPT_MYSQL_ONLY_PRINT,

    "This causes mysqlslap to not connect to the databases, but instead print \

      out what it would have done instead.",

    "This causes mysqlslap to not connect to the databases, but instead print "

      "out what it would have done instead.",

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

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

  {"password", 'p',

    "Password to use when connecting to server. If password is not given it's \

      asked from the tty.", 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},

  {"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,

    (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,

    0},

    "Password to use when connecting to server. If password is not given it's "

      "asked from the tty.", 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},

#ifdef __WIN__

  {"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,

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

#endif

  {"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,

    (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,

    0},

  {"preserve-schema", OPT_MYSQL_PRESERVE_SCHEMA,

    "Preserve the schema from the mysqlslap run.",

    (gptr*) &opt_preserve, (gptr*) &opt_preserve, 0, GET_BOOL,
@@ -434,33 +435,33 @@ static struct my_option my_long_options[] = 
  {"query", 'q', "Query to run or file containing query to run.",

    (gptr*) &user_supplied_query, (gptr*) &user_supplied_query,

    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"silent", 's', "Run program in silent mode - no output.",

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

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

#ifdef HAVE_SMEM

  {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,

    "Base name of shared memory.", (gptr*) &shared_memory_base_name,

    (gptr*) &shared_memory_base_name, 0, GET_STR_ALLOC, REQUIRED_ARG,

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

#endif

  {"silent", 's', "Run program in silent mode - no output.",

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

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

  {"slave", OPT_MYSQL_SLAP_SLAVE, "Follow master locks for other slap clients",

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

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

  {"socket", 'S', "Socket file to use for connection.",

    (gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR,

    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#include <sslopt-longopts.h>

  {"use-threads", OPT_USE_THREADS,

    "Use pthread calls instead of fork() calls (default on Windows)",

      (gptr*) &opt_use_threads, (gptr*) &opt_use_threads, 0, 

      GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#include <sslopt-longopts.h>

#ifndef DONT_ALLOW_USER_CHANGE

  {"user", 'u', "User for login if not current user.", (gptr*) &user,

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

#endif

  {"verbose", 'v',

    "More verbose output; You can use this multiple times to get even more \

      verbose output.", (gptr*) &verbose, (gptr*) &verbose, 0, 

    "More verbose output; You can use this multiple times to get even more "

      "verbose output.", (gptr*) &verbose, (gptr*) &verbose, 0, 

      GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"version", 'V', "Output version information and exit.", 0, 0, 0, GET_NO_ARG,

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

config/ac-macros/storage.m4

+4 −1
Original line number Diff line number Diff line
@@ -39,7 +39,10 @@ then 
  AC_DEFINE([$5])

  mysql_se_decls="${mysql_se_decls},$6"

  mysql_se_htons="${mysql_se_htons},&$6"

  if test "$8" != "no"

  then

    mysql_se_objs="$mysql_se_objs $8"

  fi

  mysql_se_dirs="$mysql_se_dirs $7"

  mysql_se_libs="$mysql_se_libs $9"

else

configure.in

+2 −1
Original line number Diff line number Diff line
@@ -2437,7 +2437,8 @@ MYSQL_STORAGE_ENGINE(archive,,,,,,storage/archive,, 
 \$(top_builddir)/storage/archive/libarchive.a, [

  AC_CONFIG_FILES(storage/archive/Makefile)

])

MYSQL_STORAGE_ENGINE(csv,,,,,no,storage/csv,,,[

MYSQL_STORAGE_ENGINE(csv,,,"yes",,tina_hton,storage/csv,no,

  \$(top_builddir)/storage/csv/libcsv.a,[

  AC_CONFIG_FILES(storage/csv/Makefile)

])

MYSQL_STORAGE_ENGINE(blackhole)

include/m_ctype.h

+2 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ extern MY_UNICASE_INFO *my_unicase_turkish[256]; 
#define MY_CS_READY	256    /* if a charset is initialized    */

#define MY_CS_AVAILABLE	512    /* If either compiled-in or loaded*/

#define MY_CS_CSSORT	1024   /* if case sensitive sort order   */

#define MY_CS_HIDDEN	2048   /* don't display in SHOW          */	

#define MY_CHARSET_UNDEFINED 0

include/my_base.h

+7 −2
Original line number Diff line number Diff line
@@ -161,7 +161,12 @@ enum ha_extra_function { 
    handling on the slave

  */

  HA_EXTRA_IGNORE_NO_KEY,

  HA_EXTRA_NO_IGNORE_NO_KEY

  HA_EXTRA_NO_IGNORE_NO_KEY,

  /*

    Mark the table as a log table. For some handlers (e.g. CSV) this results

    in a special locking for the table.

  */

  HA_EXTRA_MARK_AS_LOG_TABLE

};



	/* The following is parameter to ha_panic() */