mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 03:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0

Browse source 
into  frost.snake.net:/private/tmp/merge-5.1


sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown 2005-09-10 19:30:02 -05:00
commit bf0562f20d
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server-tools/instance-manager/options.cc
View file

@ -106,7 +106,7 @@ static struct my_option my_long_options[] =
(gptr *) &Options::port_number, (gptr *) &Options::port_number,
0, GET_UINT, REQUIRED_ARG, DEFAULT_PORT, 0, 0, 0, 0, 0 },
{ "password-file", OPT_PASSWORD_FILE, "Look for Instane Manager users"
{ "password-file", OPT_PASSWORD_FILE, "Look for Instance Manager users"
" and passwords here.",
(gptr *) &Options::password_file_name,
(gptr *) &Options::password_file_name,