bk commit into 4.1 tree (thek:1.2592) BUG#17498

[kpettersson]

Below is the list of changes that have just been committed into a local
4.1 repository of thek. When thek does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-12-15 07:56:01+01:00, thek@stripped +1 -0
  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@stripped, 2006-12-15 07:56:00+01:00, thek@stripped +0 -21
    Bug#17498 failed to put data file in custom directory use "data directory" option
    
    - Update result file to match the new test case.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	thek
# Host:	kpdesk.mysql.com
# Root:	/home/thek/dev/mysql-4.1-maint

--- 1.69/mysql-test/r/myisam.result	2006-12-15 07:56:05 +01:00
+++ 1.70/mysql-test/r/myisam.result	2006-12-15 07:56:05 +01:00
@@ -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;