bk commit into 5.0 tree (serg:1.1986)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg 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.1986 05/09/21 17:38:26 serg@stripped +5 -0
  aftermerge fix

  sql/sql_parse.cc
    1.491 05/09/21 17:38:03 serg@stripped +5 -2
    aftermerge fix

  sql/mysqld.cc
    1.498 05/09/21 17:38:03 serg@stripped +2 -1
    aftermerge fix

  mysql-test/r/innodb.result
    1.135 05/09/21 17:38:03 serg@stripped +1 -1
    aftermerge fix

  myisam/myisamchk.c
    1.116 05/09/21 17:38:03 serg@stripped +2 -3
    aftermerge fix

  include/myisam.h
    1.69 05/09/21 17:38:03 serg@stripped +1 -1
    aftermerge fix

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.0-merged

--- 1.68/include/myisam.h	Wed Sep 21 13:53:08 2005
+++ 1.69/include/myisam.h	Wed Sep 21 17:38:03 2005
@@ -390,7 +390,7 @@ typedef struct st_sort_key_blocks		/* Us
 typedef enum 
 {
   /* Treat NULLs as inequal when collecting statistics (default for 4.1/5.0) */
-  MI_STATS_METHOD_NULLS_NOT_EQUAL=1,
+  MI_STATS_METHOD_NULLS_NOT_EQUAL,
   /* Treat NULLs as equal when collecting statistics (like 4.0 did) */
   MI_STATS_METHOD_NULLS_EQUAL
 } enum_mi_stats_method;

--- 1.115/myisam/myisamchk.c	Wed Sep 21 13:19:19 2005
+++ 1.116/myisam/myisamchk.c	Wed Sep 21 17:38:03 2005
@@ -698,15 +698,14 @@ get_one_option(int optid,
     break;
   case OPT_STATS_METHOD:
   {
-    myisam_stats_method_str= argument;
     int method;
+    myisam_stats_method_str= argument;
     if ((method=find_type(argument, &myisam_stats_method_typelib, 2)) <= 0)
     {
       fprintf(stderr, "Invalid value of stats_method: %s.\n", argument);
       exit(1);
     }
-    check_param.stats_method= test(method-1)? MI_STATS_METHOD_NULLS_EQUAL :
-                                              MI_STATS_METHOD_NULLS_NOT_EQUAL;
+    check_param.stats_method= method-1;
     break;
   }
 #ifdef DEBUG					/* Only useful if debugging */

--- 1.497/sql/mysqld.cc	Wed Sep 21 13:53:08 2005
+++ 1.498/sql/mysqld.cc	Wed Sep 21 17:38:03 2005
@@ -6767,6 +6767,7 @@ get_one_option(int optid, const struct m
       fprintf(stderr, "Unknown option to tc-heuristic-recover: %s\n",argument);
       exit(1);
     }
+  }
   case OPT_MYISAM_STATS_METHOD:
   {
     myisam_stats_method_str= argument;
@@ -6776,7 +6777,7 @@ get_one_option(int optid, const struct m
       fprintf(stderr, "Invalid value of myisam_stats_method: %s.\n", argument);
       exit(1);
     }
-    global_system_variables.myisam_stats_method= method;
+    global_system_variables.myisam_stats_method= method-1;
     break;
   }
   case OPT_SQL_MODE:

--- 1.490/sql/sql_parse.cc	Wed Sep 21 13:19:25 2005
+++ 1.491/sql/sql_parse.cc	Wed Sep 21 17:38:03 2005
@@ -7175,8 +7175,11 @@ bool multi_delete_set_locks_and_link_aux
                target_tbl->table_name, "MULTI DELETE");
       DBUG_RETURN(TRUE);
     }
-    target_tbl->table_name= walk->table_name;
-    target_tbl->table_name_length= walk->table_name_length;
+    if (!walk->derived)
+    {
+      target_tbl->table_name= walk->table_name;
+      target_tbl->table_name_length= walk->table_name_length;
+    }
     walk->updating= target_tbl->updating;
     walk->lock_type= target_tbl->lock_type;
     target_tbl->correspondent_table= walk;	// Remember corresponding table

--- 1.134/mysql-test/r/innodb.result	Wed Sep 21 13:53:08 2005
+++ 1.135/mysql-test/r/innodb.result	Wed Sep 21 17:38:03 2005
@@ -1785,7 +1785,7 @@ Variable_name	Value
 Innodb_rows_deleted	2070
 show status like "Innodb_rows_inserted";
 Variable_name	Value
-Innodb_rows_inserted	31725
+Innodb_rows_inserted	31727
 show status like "Innodb_rows_updated";
 Variable_name	Value
 Innodb_rows_updated	29530