diff options
| author | unknown <cmiller@zippy.(none)> | 2006-05-16 18:42:59 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-05-16 18:42:59 -0400 |
| commit | 4d861dad61e3ca7d38c46a3f806ea6fd67c81b7c (patch) | |
| tree | 98044ffcc9073e8616870414cb470ee7094eba48 /client/mysql.cc | |
| parent | 6a278824dba6c678e19ff00af748ac6d657bae1d (diff) | |
| parent | 97b4446aca03de6831c83649215da92b62ff7ee1 (diff) | |
| download | mariadb-git-4d861dad61e3ca7d38c46a3f806ea6fd67c81b7c.tar.gz | |
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
client/mysql.cc:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/rpl_temporary.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/rpl_temporary.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 739368dec18..8b121579cb0 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -448,6 +448,14 @@ int main(int argc,char *argv[]) MYF(MY_WME)); if (histfile) sprintf(histfile,"%s/.mysql_history",getenv("HOME")); + char link_name[FN_REFLEN]; + if (my_readlink(link_name, histfile, 0) == 0 && + strncmp(link_name, "/dev/null", 10) == 0) + { + /* The .mysql_history file is a symlink to /dev/null, don't use it */ + my_free(histfile, MYF(MY_ALLOW_ZERO_PTR)); + histfile= 0; + } } if (histfile) { @@ -484,7 +492,7 @@ sig_handler mysql_end(int sig) { mysql_close(&mysql); #ifdef HAVE_READLINE - if (!status.batch && !quick && !opt_html && !opt_xml) + if (!status.batch && !quick && !opt_html && !opt_xml && histfile) { /* write-history */ if (verbose) |