bk commit into 5.1 tree (thek:1.2364)

[kpettersson]

Below is the list of changes that have just been committed into a local
5.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-14 13:53:13+01:00, thek@stripped +4 -0
  Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498
  into  kpdesk.mysql.com:/home/thek/dev/bug17489/my51-bug17498
  MERGE: 1.1810.2359.30

  mysql-test/r/myisam.result@stripped, 2006-12-14 13:53:10+01:00, thek@stripped +0 -0
    SCCS merged
    MERGE: 1.71.1.21

  mysql-test/r/symlink.result@stripped, 2006-12-14 13:46:13+01:00, thek@stripped +0 -0
    Auto merged
    MERGE: 1.21.1.6

  mysql-test/t/myisam.test@stripped, 2006-12-14 13:46:13+01:00, thek@stripped +0 -0
    Auto merged
    MERGE: 1.55.1.17

  mysql-test/t/symlink.test@stripped, 2006-12-14 13:46:13+01:00, thek@stripped +0 -0
    Auto merged
    MERGE: 1.17.1.2

# 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/my51-bug17498/RESYNC

--- 1.98/mysql-test/r/myisam.result	2006-12-14 13:53:19 +01:00
+++ 1.99/mysql-test/r/myisam.result	2006-12-14 13:53:19 +01:00
@@ -1590,19 +1590,6 @@ show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	1	a	1	a	A	8	NULL	NULL	YES	BTREE	
 drop table t1;
-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;
 End of 4.1 tests
 create table t1 (c1 int) engine=myisam pack_keys=0;
 create table t2 (c1 int) engine=myisam pack_keys=1;

--- 1.71/mysql-test/t/myisam.test	2006-12-14 13:53:19 +01:00
+++ 1.72/mysql-test/t/myisam.test	2006-12-14 13:53:19 +01:00
@@ -942,40 +942,6 @@ alter table t1 enable keys;
 show keys from t1;
 
 drop table t1;
-#
-# 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;
 
 --echo End of 4.1 tests
 

--- 1.28/mysql-test/r/symlink.result	2006-12-14 13:53:19 +01:00
+++ 1.29/mysql-test/r/symlink.result	2006-12-14 13:53:19 +01:00
@@ -111,3 +111,24 @@ t1	CREATE TABLE `t1` (
   `i` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
+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;

--- 1.20/mysql-test/t/symlink.test	2006-12-14 13:53:19 +01:00
+++ 1.21/mysql-test/t/symlink.test	2006-12-14 13:53:19 +01:00
@@ -139,4 +139,41 @@ enable_query_log;
 show create table t1;
 drop table t1;
 
+#
+# 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="$MYSQL_TEST_DIR/var/log" select 9 a;
+enable_query_log;
+# If running test suite with a non standard tmp dir, the "show create table"
+# will print "DATA_DIRECTORY=". Use replace_result to mask it out
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+show create table t1;
+
+connection session2;
+disable_query_log;
+eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/log" select 99 a;
+enable_query_log;
+# If running test suite with a non standard tmp dir, the "show create table"
+# will print "DATA_DIRECTORY=". Use replace_result to mask it out
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+show create table t1;
+
+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