bk commit into 5.0 tree (thek:1.2353) BUG#17498

[kpettersson]

Below is the list of changes that have just been committed into a local
5.0 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-14 13:45:17+01:00, thek@stripped +2 -0
  Bug#17498 failed to put data file in custom directory use "data directory" option
  
  Merged 4.1->5.0. Updated myisam.test

  mysql-test/r/myisam.result@stripped, 2006-12-14 13:45:15+01:00, thek@stripped +0 -13
    updated result file

  mysql-test/t/myisam.test@stripped, 2006-12-14 13:45:15+01:00, thek@stripped +0 -34
    Removing symlink specific test from myisam test

# 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/bug17489/my50-bug17498

--- 1.91/mysql-test/r/myisam.result	2006-12-14 13:45:22 +01:00
+++ 1.92/mysql-test/r/myisam.result	2006-12-14 13:45:22 +01:00
@@ -1608,16 +1608,3 @@ create table t3 (c1 int) engine=myisam p
 create table t4 (c1 int) engine=myisam pack_keys=2;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near '2' at line 1
 drop table t1, t2, t3;
-show create table t1;
-show create table t1;
-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;

--- 1.71/mysql-test/t/myisam.test	2006-12-14 13:45:22 +01:00
+++ 1.72/mysql-test/t/myisam.test	2006-12-14 13:45:22 +01:00
@@ -969,39 +969,5 @@ create table t3 (c1 int) engine=myisam p
 --error 1064
 create table t4 (c1 int) engine=myisam pack_keys=2;
 drop table t1, t2, t3;
-#
-# Bug#8706 - temporary table with data directory option fails
-#
-connect (session1,localhost,root,,);
-connect (session2,localhost,root,,);
-
-connection session1;
-disable_query_log;
-eval create temporary table t1 (a int) engine=myisam data
directory="$MYSQLTEST_VARDIR/tmp" select 9 a;
-enable_query_log;
-disable_result_log;
-show create table t1;
-enable_result_log;
-
-connection session2;
-disable_query_log;
-eval create temporary table t1 (a int) engine=myisam data
directory="$MYSQLTEST_VARDIR/tmp" select 99 a;
-enable_query_log;
-disable_result_log;
-show create table t1;
-enable_result_log;
-
-connection default;
-create table t1 (a int) engine=myisam select 42 a;
-
-connection session1;
-select * from t1;
-disconnect session1;
-connection session2;
-select * from t1;
-disconnect session2;
-connection default;
-select * from t1;
-drop table t1;
 
 # End of 4.1 tests