Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0

into gw.mysql.r18.ru:/usr/home/ram/work/5.0

mysql-test/r/rpl_auto_increment.result

@@ -39,7 +39,7 @@ drop table t1;
 set @@session.auto_increment_increment=100, @@session.auto_increment_offset=10;
 show variables like "%auto%";
 Variable_name	Value
-auto_incrememt_increment	100
+auto_increment_increment	100
 auto_increment_offset	10
 create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
 insert into t1 values (NULL),(5),(NULL);

sql/set_var.cc

@@ -632,7 +632,7 @@ sys_var *sys_variables[]=
 */
 
 struct show_var_st init_vars[]= {
-  {"auto_incrememt_increment", (char*) &sys_auto_increment_increment, SHOW_SYS},
+  {"auto_increment_increment", (char*) &sys_auto_increment_increment, SHOW_SYS},
   {"auto_increment_offset",   (char*) &sys_auto_increment_offset, SHOW_SYS},
   {"back_log",                (char*) &back_log,                    SHOW_LONG},
   {"basedir",                 mysql_home,                           SHOW_CHAR},