bk commit into 5.1 tree (gkodinov:1.2316)

[gkodinov]

Below is the list of changes that have just been committed into a local
5.1 repository of gkodinov. When gkodinov 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-10-20 10:12:38+02:00, gkodinov@stripped +4 -0
  sql_rename.cc, sql_table.cc, type_decimal.result, mix2_myisam.result:
    merge fixes

  mysql-test/r/mix2_myisam.result@stripped, 2006-10-20 10:10:31+02:00, gkodinov@stripped +8 -8
    merge fixes

  mysql-test/r/type_decimal.result@stripped, 2006-10-20 10:10:38+02:00, gkodinov@stripped +3 -3
    merge fixes

  sql/sql_rename.cc@stripped, 2006-10-20 10:11:48+02:00, gkodinov@stripped +5 -4
    merge fixes

  sql/sql_table.cc@stripped, 2006-10-20 10:11:54+02:00, gkodinov@stripped +5 -3
    merge fixes

# 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:	gkodinov
# Host:	dl145s.mysql.com
# Root:	/data/bk/team_tree_merge/MERGE/mysql-5.1-opt

--- 1.367/sql/sql_table.cc	2006-10-20 10:12:43 +02:00
+++ 1.368/sql/sql_table.cc	2006-10-20 10:12:43 +02:00
@@ -5151,7 +5151,8 @@
   char reg_path[FN_REFLEN+1];
   ha_rows copied,deleted;
   uint db_create_options, used_fields;
-  handlerton *old_db_type, *new_db_type, table_type;
+  handlerton *old_db_type, *new_db_type;
+  legacy_db_type table_type;
   HA_CREATE_INFO *create_info;
   frm_type_enum frm_type;
   uint need_copy_table= 0;
@@ -5235,8 +5236,9 @@
   if (alter_info->tablespace_op != NO_TABLESPACE_OP)
     DBUG_RETURN(mysql_discard_or_import_tablespace(thd,table_list,
 						   alter_info->tablespace_op));
-  sprintf(new_name_buff,"%s/%s/%s%s",mysql_data_home, db, table_name, reg_ext);
-  unpack_filename(new_name_buff, new_name_buff);
+  strxnmov(new_name_buff, sizeof (new_name_buff) - 1, mysql_data_home, "/", db, 
+           "/", table_name, reg_ext, NullS);
+  (void) unpack_filename(new_name_buff, new_name_buff);
   if (lower_case_table_names != 2)
     my_casedn_str(files_charset_info, new_name_buff);
   frm_type= mysql_frm_type(thd, new_name_buff, &table_type);

--- 1.3/mysql-test/r/mix2_myisam.result	2006-10-20 10:12:43 +02:00
+++ 1.4/mysql-test/r/mix2_myisam.result	2006-10-20 10:12:43 +02:00
@@ -1611,15 +1611,15 @@
 select sql_big_result v,count(c) from t1 group by v limit 10;
 v	count(c)
 a
	1
-a	10
-b	10
-c	10
-d	10
-e	10
-f	10
-g	10
+a 	10
+b     	10
+c    	10
+d   	10
+e  	10
+f     	10
+g    	10
 h	10
-i	10
+i     	10
 select c,count(*) from t1 group by c limit 10;
 c	count(*)
 a
	1

--- 1.44/mysql-test/r/type_decimal.result	2006-10-20 10:12:43 +02:00
+++ 1.45/mysql-test/r/type_decimal.result	2006-10-20 10:12:43 +02:00
@@ -786,7 +786,7 @@
 group_concat(t)
 t
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00'
+Warning	1292	Incorrect datetime value: '0000-00-00'
+Warning	1292	Incorrect datetime value: '0000-00-00'
+Warning	1292	Incorrect datetime value: '0000-00-00'
 drop table t1;

--- 1.38/sql/sql_rename.cc	2006-10-20 10:12:43 +02:00
+++ 1.39/sql/sql_rename.cc	2006-10-20 10:12:43 +02:00
@@ -165,7 +165,7 @@
   else
   {
     old_alias= ren_table->table_name;
-    new_alias= new_table_table_name;
+    new_alias= new_table_name;
   }
   build_table_filename(name, sizeof(name),
                        new_db, new_alias, reg_ext, 0);
@@ -182,8 +182,10 @@
   {
     case FRMTYPE_TABLE:
       {
-        if (!(rc= mysql_rename_table(table_type, ren_table->db, old_alias,
-                                     new_db, new_alias)))
+        if (!(rc= mysql_rename_table(ha_resolve_by_legacy_type(thd,
+                                                               table_type), 
+                                     ren_table->db, old_alias,
+                                     new_db, new_alias, 0)))
         {
           if ((rc= Table_triggers_list::change_table_name(thd, ren_table->db,
                                                           old_alias,
@@ -204,7 +206,6 @@
         }
       }
       break;
-    }
     case FRMTYPE_VIEW:
       /* change of schema is not allowed */
       if (strcmp(ren_table->db, new_db))