diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-03-13 01:03:34 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-03-13 01:03:34 +0200 |
| commit | 4fd59d9cff967daddedede566695f59f9776e938 (patch) | |
| tree | 487be07b827e81f7e42861224be5011ec2d2d4c2 /client | |
| parent | bc15643c82a049cd3a74ac921859623f9649cede (diff) | |
| parent | 0e43a70453321aac082c4c44665b3dca84be0e3d (diff) | |
| download | mariadb-git-4fd59d9cff967daddedede566695f59f9776e938.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
Auto merged
client/mysql.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 7734eeadde0..39fe023aeac 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -118,7 +118,8 @@ static bool info_flag=0,ignore_errors=0,wait_flag=0,quick=0, no_rehash=0,skip_updates=0,safe_updates=0,one_database=0, opt_compress=0, using_opt_local_infile=0, vertical=0,skip_line_numbers=0,skip_column_names=0,opt_html=0, - opt_xml=0,opt_nopager=1, opt_outfile=0, no_named_cmds=1; + opt_xml=0,opt_nopager=1, opt_outfile=0, no_named_cmds=1, + opt_nobeep=0; static uint verbose=0,opt_silent=0,opt_mysql_port=0, opt_local_infile=0; static my_string opt_mysql_unix_port=0; static int connect_flag=CLIENT_INTERACTIVE; @@ -438,6 +439,7 @@ static struct option long_options[] = {"ignore-spaces", no_argument, 0, 'i'}, {"local-infile", optional_argument, 0, OPT_LOCAL_INFILE}, {"no-auto-rehash",no_argument, 0, 'A'}, + {"no-beep", no_argument, 0, 'b'}, {"no-named-commands", no_argument, 0, 'g'}, {"no-tee", no_argument, 0, OPT_NOTEE}, #ifndef __WIN__ @@ -501,6 +503,7 @@ static void usage(int version) -A, --no-auto-rehash No automatic rehashing. One has to use 'rehash' to\n\ get table and field completion. This gives a quicker\n\ start of mysql and disables rehashing on reconnect.\n\ + -b, --no-beep Turn off beep on error.\n\ -B, --batch Print results with a tab as separator, each row on\n\ a new line. Doesn't use history file.\n\ --character-sets-dir=...\n\ @@ -605,7 +608,7 @@ static int get_options(int argc, char **argv) set_all_changeable_vars(changeable_vars); while ((c=getopt_long(argc,argv, - (char*) "?ABCD:LfgGHXinNoqrstTU::vVw::WEe:h:O:P:S:u:#::p::", + (char*) "?AbBCD:LfgGHXinNoqrstTU::vVw::WEe:h:O:P:S:u:#::p::", long_options, &option_index)) != EOF) { switch(c) { @@ -616,6 +619,9 @@ static int get_options(int argc, char **argv) strmov(mysql_charsets_dir, optarg); charsets_dir = mysql_charsets_dir; break; + case 'b': + opt_nobeep = 1; + break; case OPT_TEE: if (!opt_outfile && strlen(optarg)) { @@ -2442,7 +2448,8 @@ put_info(const char *str,INFO_TYPE info_type,uint error) } if (info_type == INFO_ERROR) { - putchar('\007'); /* This should make a bell */ + if(!opt_nobeep) + putchar('\007'); /* This should make a bell */ vidattr(A_STANDOUT); if (error) (void) tee_fprintf(stderr, "ERROR %d: ", error); |