Commit d2baf0f1 authored by unknown's avatar unknown
Browse files

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/dbdata/psergey/mysql-4.1-bug-psnames


sql/sql_class.cc:
  Auto merged
parents 02d3c022 c62dd0d4

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ static struct my_option my_long_options[] = 
  {"silent", 's', "Be more silent. Print results with a tab as separator, each row on new line.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0,

   0, 0},

#ifdef HAVE_SMEM

  {"shared_memory_base_name", OPT_SHARED_MEMORY_BASE_NAME,

  {"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

client/mysqladmin.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static struct my_option my_long_options[] = 
   "Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.",

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

#ifdef HAVE_SMEM

  {"shared_memory_base_name", OPT_SHARED_MEMORY_BASE_NAME,

  {"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

client/mysqlcheck.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static struct my_option my_long_options[] = 
   "Can fix almost anything except unique keys that aren't unique.",

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

#ifdef HAVE_SMEM

  {"shared_memory_base_name", OPT_SHARED_MEMORY_BASE_NAME,

  {"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

client/mysqldump.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static struct my_option my_long_options[] = 
   "Direct output to a given file. This option should be used in MSDOS, because it prevents new line '\\n' from being converted to '\\r\\n' (carriage return + line feed).",

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

#ifdef HAVE_SMEM

  {"shared_memory_base_name", OPT_SHARED_MEMORY_BASE_NAME,

  {"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

client/mysqlimport.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static struct my_option my_long_options[] = 
  {"replace", 'r', "If duplicate unique key was found, replace old row.",

   (gptr*) &replace, (gptr*) &replace, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

#ifdef HAVE_SMEM

  {"shared_memory_base_name", OPT_SHARED_MEMORY_BASE_NAME,

  {"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