Commit eff3eb82 authored by paul@central.snake.net's avatar paul@central.snake.net

resolve merge problem

parents 9d068138 74336ec9
...@@ -6,6 +6,7 @@ monty@donna.mysql.com ...@@ -6,6 +6,7 @@ monty@donna.mysql.com
monty@narttu.mysql.fi monty@narttu.mysql.fi
mwagner@evoq.home.mwagner.org mwagner@evoq.home.mwagner.org
mwagner@work.mysql.com mwagner@work.mysql.com
paul@central.snake.net
sasha@donna.mysql.com sasha@donna.mysql.com
sasha@laptop.slkc.uswest.net sasha@laptop.slkc.uswest.net
sasha@mysql.sashanet.com sasha@mysql.sashanet.com
......
...@@ -28292,8 +28292,7 @@ completion. This gives a quicker start of mysql. ...@@ -28292,8 +28292,7 @@ completion. This gives a quicker start of mysql.
Print results with a tab as separator, each row on a new line. Doesn't use Print results with a tab as separator, each row on a new line. Doesn't use
history file. history file.
@cindex character sets option @cindex character sets option
@item @item --character-sets-dir=...
--character-sets-dir=...
Directory where character sets are located. Directory where character sets are located.
@cindex compress option. @cindex compress option.
@item -C, --compress @item -C, --compress
...@@ -28302,11 +28301,11 @@ Use compression in server/client protocol. ...@@ -28302,11 +28301,11 @@ Use compression in server/client protocol.
@item -#, --debug[=...] @item -#, --debug[=...]
Debug log. Default is 'd:t:o,/tmp/mysql.trace'. Debug log. Default is 'd:t:o,/tmp/mysql.trace'.
@cindex database option @cindex database option
@item -D, --database=.. @item -D, --database=...
Database to use. This is mainly useful in the @code{my.cnf} file. Database to use. This is mainly useful in the @code{my.cnf} file.
@cindex default character set option @cindex default character set option
@item @item --default-character-set=...
--default-character-set=... Set the default character set. Set the default character set.
@cindex execute option @cindex execute option
@item -e, --execute=... @item -e, --execute=...
Execute command and quit. (Output like with --batch) Execute command and quit. (Output like with --batch)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment