diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-01-07 09:31:49 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-01-07 09:31:49 -0500 |
| commit | 0517aa59ed854e0fce173a169fb3f07b36fbe201 (patch) | |
| tree | ef218d11fc7a48e2a033e23e5e9cbe9dfda3a7ed /scripts/mysqlbug.sh | |
| parent | 702a25ddb86c3231bee2a97fae5ddb14067540c2 (diff) | |
| parent | ead6b1055767c1f590e66ef8e42ac4b5796ef421 (diff) | |
| download | mariadb-git-0517aa59ed854e0fce173a169fb3f07b36fbe201.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
Makefile.am:
Auto merged
configure.in:
Auto merged
include/mysql.h:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysqlbug.sh:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
sql/event_queue.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
mysql-test/r/warnings.result:
Manual merge.
mysql-test/t/warnings.test:
Manual merge.
strings/ctype-extra.c:
Manual merge.
Diffstat (limited to 'scripts/mysqlbug.sh')
| -rw-r--r-- | scripts/mysqlbug.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/mysqlbug.sh b/scripts/mysqlbug.sh index 875df566815..69ea82e8794 100644 --- a/scripts/mysqlbug.sh +++ b/scripts/mysqlbug.sh @@ -147,7 +147,13 @@ if test -z "$VISUAL" then if test -z "$EDITOR" then - EDIT=emacs + # Honor debian sensible-editor + if test -x "/usr/bin/sensible-editor" + then + EDIT=/usr/bin/sensible-editor + else + EDIT=emacs + fi else EDIT="$EDITOR" fi |