aftermerge fix

include/myisam.h

@@ -390,7 +390,7 @@ typedef struct st_sort_key_blocks		/* Used when sorting */
 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;

myisam/myisamchk.c

@@ -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 */

mysql-test/r/innodb.result

@@ -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

sql/mysqld.cc

@@ -6767,6 +6767,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
       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 my_option *opt __attribute__((unused)),
       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:

sql/sql_parse.cc

@@ -7175,8 +7175,11 @@ bool multi_delete_set_locks_and_link_aux_tables(LEX *lex)
                target_tbl->table_name, "MULTI DELETE");
       DBUG_RETURN(TRUE);
     }
+    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