bk commit into 4.1 tree (acurtis:1.2530) BUG#8706

[antony]

Below is the list of changes that have just been committed into a local
4.1 repository of antony. When antony 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
  1.2530 06/07/05 17:18:59 acurtis@stripped +3 -0
  Bug#8706
    "temporary table with data directory option fails"
    myisam should not use user-specified table name when creating
    temporary tables and use generated connection specific real name.
    Test included.

  mysql-test/t/myisam.test
    1.48 06/07/05 17:18:56 acurtis@stripped +31 -0
    Bug#8706
      Test for bug

  mysql-test/r/myisam.result
    1.62 06/07/05 17:18:56 acurtis@stripped +21 -0
    Bug#8706
      Test for bug

  myisam/mi_create.c
    1.48 06/07/05 17:18:56 acurtis@stripped +29 -7
    Bug#8706
      When creating a temporary table with directory override, ensure that
      the real filename is using the hidden temporary name otherwise
      multiple clients cannot have same named temporary tables without
      conflict.

# 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:	acurtis
# Host:	ltantony.xiphis.org
# Root:	/home/antony/work2/p2-bug8706.3

--- 1.47/myisam/mi_create.c	2005-07-23 08:03:31 -07:00
+++ 1.48/myisam/mi_create.c	2006-07-05 17:18:56 -07:00
@@ -519,9 +519,20 @@ int mi_create(const char *name,uint keys
 
   if (ci->index_file_name)
   {
-    fn_format(filename, ci->index_file_name,"",MI_NAME_IEXT,4);
-    fn_format(linkname,name, "",MI_NAME_IEXT,4);
-    linkname_ptr=linkname;
+    if (options & HA_OPTION_TMP_TABLE)
+    {
+      char *path;
+      /* chop off the table name, tempory tables use generated name */
+      if ((path= strrchr(ci->index_file_name, FN_LIBCHAR)))
+        *path= '\0';
+      fn_format(filename, name, ci->index_file_name, MI_NAME_IEXT,
+                MY_REPLACE_DIR | MY_UNPACK_FILENAME);
+    }
+    else
+      fn_format(filename, ci->index_file_name, "",
+                MI_NAME_IEXT, MY_UNPACK_FILENAME);
+    fn_format(linkname, name, "", MI_NAME_IEXT, MY_UNPACK_FILENAME);
+    linkname_ptr= linkname;
     /*
       Don't create the table if the link or file exists to ensure that one
       doesn't accidently destroy another table.
@@ -575,10 +586,21 @@ int mi_create(const char *name,uint keys
     {
       if (ci->data_file_name)
       {
-	fn_format(filename, ci->data_file_name,"",MI_NAME_DEXT,4);
-	fn_format(linkname, name, "",MI_NAME_DEXT,4);
-	linkname_ptr=linkname;
-	create_flag=0;
+        if (options & HA_OPTION_TMP_TABLE)
+        {
+          char *path;
+          /* chop off the table name, tempory tables use generated name */
+          if ((path= strrchr(ci->data_file_name, FN_LIBCHAR)))
+            *path= '\0';
+          fn_format(filename, name, ci->data_file_name, MI_NAME_DEXT,
+                    MY_REPLACE_DIR | MY_UNPACK_FILENAME);
+        }
+        else
+          fn_format(filename, ci->data_file_name, "",
+                    MI_NAME_DEXT, MY_UNPACK_FILENAME);
+        fn_format(linkname, name, "", MI_NAME_DEXT, MY_UNPACK_FILENAME);
+        linkname_ptr= linkname;
+        create_flag= 0;
       }
       else
       {

--- 1.61/mysql-test/r/myisam.result	2006-06-21 05:51:13 -07:00
+++ 1.62/mysql-test/r/myisam.result	2006-07-05 17:18:56 -07:00
@@ -769,3 +769,24 @@ a	b
 xxxxxxxxx	bbbbbb
 xxxxxxxxx	bbbbbb
 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
+show create table t1;
+Table	Create Table
+t1	CREATE TEMPORARY TABLE `t1` (
+  `a` int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+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.47/mysql-test/t/myisam.test	2006-06-21 05:51:13 -07:00
+++ 1.48/mysql-test/t/myisam.test	2006-07-05 17:18:56 -07:00
@@ -726,4 +726,35 @@ UPDATE t1 AS ta1,t1 AS ta2 SET ta1.b='aa
 SELECT * 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="$MYSQL_TEST_DIR/var/tmp" select 9 a;
+enable_query_log;
+show create table t1;
+
+connection session2;
+disable_query_log;
+eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/tmp" select 99 a;
+enable_query_log;
+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