Commit 33f04ca9 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
parents 6ff38ce7 ec619beb

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ static struct my_option my_long_options[] = 
   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,

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

   0},

  {"prompt", OPT_PROMPT, "Set the mysql prompt to this value.",

   (gptr*) &current_prompt, (gptr*) &current_prompt, 0, GET_STR_ALLOC,

configure.in

+1 −1
Original line number Diff line number Diff line 
dnl -*- ksh -*-

dnl Process this file with autoconf to produce a configure script.



AC_PREREQ(2.57)dnl		Minimum Autoconf version required.

AC_PREREQ(2.52)dnl		Minimum Autoconf version required.



AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM