From 24dfe0b0b40304a2cc2619a4b3dbc846b5428929 Mon Sep 17 00:00:00 2001
From: "thek@kpdesk.mysql.com" <>
Date: Fri, 15 Dec 2006 07:56:01 +0100
Subject: [PATCH 1/2] Bug#17498 failed to put data file in custom directory use
 "data directory" option

- Result file was not properly committed.
- Update result file to match the new test case.
---
 mysql-test/r/myisam.result | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index b34c127595f..1af927d32f0 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -923,24 +923,3 @@ SET @@myisam_repair_threads=1;
 SHOW VARIABLES LIKE 'myisam_repair%';
 Variable_name	Value
 myisam_repair_threads	1
-show create table t1;
-Table	Create Table
-t1	CREATE TEMPORARY TABLE `t1` (
-  `a` int(11) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'
-show create table t1;
-Table	Create Table
-t1	CREATE TEMPORARY TABLE `t1` (
-  `a` int(11) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'
-create table t1 (a int) engine=myisam select 42 a;
-select * from t1;
-a
-9
-select * from t1;
-a
-99
-select * from t1;
-a
-42
-drop table t1;

From 3da37d3fa2d1f5db00afbff25006821e19e7e2cd Mon Sep 17 00:00:00 2001
From: "mtaylor@qualinost.(none)" <>
Date: Fri, 15 Dec 2006 10:57:58 -0800
Subject: [PATCH 2/2] Added support for sensible-editor from Debian, instead of
 emacs.

---
 scripts/mysqlbug.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/mysqlbug.sh b/scripts/mysqlbug.sh
index 6aed140b79d..880ab248a90 100644
--- a/scripts/mysqlbug.sh
+++ b/scripts/mysqlbug.sh
@@ -132,7 +132,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