bk commit into 5.0 tree (kaa:1.2486) BUG#29015

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.0 repository of kaa. When kaa 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, 2007-06-11 23:06:20+04:00, kaa@stripped +5 -0
  Fix for bug #29015 "Stack overflow in processing temporary table name when tmpdir path
is long"
  
  In create_tmp_table() don't set full table path as a table name. Other code assumes
table names to not exceed NAME_LEN bytes.

  mysql-test/r/long_tmpdir.result@stripped, 2007-06-11 23:06:18+04:00, kaa@stripped +3 -0
    Added testcase for bug #29015 "Stack overflow in processing temporary table name when
tmpdir path is long"

  mysql-test/r/long_tmpdir.result@stripped, 2007-06-11 23:06:18+04:00, kaa@stripped +0 -0

  mysql-test/t/long_tmpdir-master.opt@stripped, 2007-06-11 23:06:18+04:00, kaa@stripped +1
-0
    Added testcase for bug #29015 "Stack overflow in processing temporary table name when
tmpdir path is long"

  mysql-test/t/long_tmpdir-master.opt@stripped, 2007-06-11 23:06:18+04:00, kaa@stripped +0
-0

  mysql-test/t/long_tmpdir-master.sh@stripped, 2007-06-11 23:06:18+04:00, kaa@stripped +3 -0
    Added testcase for bug #29015 "Stack overflow in processing temporary table name when
tmpdir path is long"

  mysql-test/t/long_tmpdir-master.sh@stripped, 2007-06-11 23:06:18+04:00, kaa@stripped +0 -0

  mysql-test/t/long_tmpdir.test@stripped, 2007-06-11 23:06:18+04:00, kaa@stripped +9 -0
    Added testcase for bug #29015 "Stack overflow in processing temporary table name when
tmpdir path is long"

  mysql-test/t/long_tmpdir.test@stripped, 2007-06-11 23:06:18+04:00, kaa@stripped +0 -0

  sql/sql_select.cc@stripped, 2007-06-11 23:06:18+04:00, kaa@stripped +12 -8
    In create_tmp_table() don't set full table path as a table name. Other code assumes
table names to not exceed NAME_LEN bytes.

# 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:	kaa
# Host:	polly.local
# Root:	/home/kaa/src/maint/bug28895/my50-bug28895

--- 1.515/sql/sql_select.cc	2007-04-30 07:14:31 +04:00
+++ 1.516/sql/sql_select.cc	2007-06-11 23:06:18 +04:00
@@ -9102,7 +9102,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARA
   bool  using_unique_constraint= 0;
   bool  use_packed_rows= 0;
   bool  not_all_columns= !(select_options & TMP_TABLE_ALL_COLUMNS);
-  char	*tmpname,path[FN_REFLEN];
+  char	*tmpname, *tmppath, path[FN_REFLEN], table_name[NAME_LEN+1];
   byte	*pos,*group_buff;
   uchar *null_flags;
   Field **reg_field, **from_field, **default_field;
@@ -9125,12 +9125,12 @@ create_tmp_table(THD *thd,TMP_TABLE_PARA
     temp_pool_slot = bitmap_set_next(&temp_pool);
 
   if (temp_pool_slot != MY_BIT_NONE) // we got a slot
-    sprintf(path, "%s_%lx_%i", tmp_file_prefix,
-	    current_pid, temp_pool_slot);
+    sprintf(table_name, "%s_%lx_%i", tmp_file_prefix,
+            current_pid, temp_pool_slot);
   else
   {
     /* if we run out of slots or we are not using tempool */
-    sprintf(path,"%s%lx_%lx_%x", tmp_file_prefix,current_pid,
+    sprintf(table_name, "%s%lx_%lx_%x", tmp_file_prefix,current_pid,
             thd->thread_id, thd->tmp_table++);
   }
 
@@ -9138,7 +9138,8 @@ create_tmp_table(THD *thd,TMP_TABLE_PARA
     No need to change table name to lower case as we are only creating
     MyISAM or HEAP tables here
   */
-  fn_format(path, path, mysql_tmpdir, "", MY_REPLACE_EXT|MY_UNPACK_FILENAME);
+  fn_format(path, table_name, mysql_tmpdir, "",
+            MY_REPLACE_EXT|MY_UNPACK_FILENAME);
 
   if (group)
   {
@@ -9183,7 +9184,8 @@ create_tmp_table(THD *thd,TMP_TABLE_PARA
                         sizeof(*key_part_info)*(param->group_parts+1),
                         &param->start_recinfo,
                         sizeof(*param->recinfo)*(field_count*2+4),
-                        &tmpname, (uint) strlen(path)+1,
+                        &tmppath, (uint) strlen(path)+1,
+                        &tmpname, (uint) strlen(table_name)+1,
                         &group_buff, group && ! using_unique_constraint ?
                         param->group_length : 0,
                         NullS))
@@ -9201,7 +9203,8 @@ create_tmp_table(THD *thd,TMP_TABLE_PARA
     DBUG_RETURN(NULL);				/* purecov: inspected */
   }
   param->items_to_copy= copy_func;
-  strmov(tmpname,path);
+  strmov(tmppath, path);
+  strmov(tmpname, table_name);
   /* make table according to fields */
 
   bzero((char*) table,sizeof(*table));
@@ -9227,7 +9230,8 @@ create_tmp_table(THD *thd,TMP_TABLE_PARA
 
   table->s= &table->share_not_to_be_used;
   table->s->blob_field= blob_field;
-  table->s->table_name= table->s->path= tmpname;
+  table->s->table_name= tmpname;
+  table->s->path= tmppath;
   table->s->db= "";
   table->s->blob_ptr_size= mi_portable_sizeof_char_ptr;
   table->s->tmp_table= NON_TRANSACTIONAL_TMP_TABLE;
--- New file ---
+++ mysql-test/r/long_tmpdir.result	07/06/11 23:06:18
create view v1 as select table_name from information_schema.tables;
drop view v1;
End of 5.0 tests

--- New file ---
+++ mysql-test/t/long_tmpdir-master.opt	07/06/11 23:06:18
--tmpdir=$MYSQLTEST_VARDIR/tmp/long_temporary_directory_path_123456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789

--- New file ---
+++ mysql-test/t/long_tmpdir-master.sh	07/06/11 23:06:18
d="$MYSQLTEST_VARDIR/tmp/long_temporary_directory_path_123456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789"
test -d "$d" || mkdir "$d"
rm -f "$d"/*

--- New file ---
+++ mysql-test/t/long_tmpdir.test	07/06/11 23:06:18
#
# Bug #29015: Stack overflow in processing temporary table name when tmpdir path
#             is long
#

create view v1 as select table_name from information_schema.tables;
drop view v1;

--echo End of 5.0 tests