diff options
| author | unknown <monty@donna.mysql.com> | 2000-12-24 15:22:33 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-12-24 15:22:33 +0200 |
| commit | 967c1b04c0cfedbb618083ac0874602fd67ed954 (patch) | |
| tree | decaf5525533d4b56d277f4507959de40b717e13 /client | |
| parent | 25e911fa5e6ae6389231bffd6e64f9bd292aa3bc (diff) | |
| parent | 78cf07c8ea126fc03706988de23893ca4680ac77 (diff) | |
| download | mariadb-git-967c1b04c0cfedbb618083ac0874602fd67ed954.tar.gz | |
merge
configure.in:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 4845b6505b9..30e7d75ecaa 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -505,10 +505,12 @@ static void usage(int version) log.\n"); #ifndef __WIN__ printf("\ - --pager[=...] Output type. Default is your ENV variable PAGER.\n\ + --pager[=...] Pager to use to display results. If you don't supply\n\ + an option the default pager is taken from your ENV\n\ + variable PAGER (%s).\n\ Valid pagers are less, more, cat [> filename], etc.\n\ See interactive help (\\h) also. This option does\n\ - not work in batch mode.\n"); + not work in batch mode.\n", getenv("PAGER") ? getenv("PAGER") : ""); #endif printf("\ -p[password], --password[=...]\n\ |