Commit 4ec2071a authored by unknown's avatar unknown
Browse files

Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 

into  dator5.(none):/home/pappa/bug21388


mysql-test/t/disabled.def:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.h:
  Auto merged
parents 37c67ec9 ff318949

mysql-test/t/disabled.def

+5 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#events_stress            : BUG#17619 2006-02-21 andrey  Race conditions

#events                   : BUG#17619 2006-02-21 andrey  Race conditions

#events_scheduling        : BUG#19170 2006-04-26 andrey  Test case of 19170 fails on some platforms. Has to be checked.

#im_instance_conf          : Bug#20294 2006-06-06 monty   Instance manager test im_instance_conf fails randomly

im_instance_conf          : Bug#20294 2006-06-06 monty   Instance manager test im_instance_conf fails randomly

im_options                : Bug#20294 2006-07-24 stewart   Instance manager test im_instance_conf fails randomly

#im_life_cycle             : Bug#20368 2006-06-10 alik    im_life_cycle test fails

ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
@@ -44,3 +44,7 @@ rpl_row_basic_7ndb : BUG#21298 2006-07-27 msvensson 
rpl_truncate_7ndb        : BUG#21298 2006-07-27 msvensson

crash_commit_before      : 2006-08-02 msvensson

rpl_ndb_dd_advance       : BUG#18679 2006-07-28 jimw (Test fails randomly)



func_group               : BUG#21924 2006-08-30 reggie

func_in                  : BUG#21925 2006-08-30 reggie

partition_mgm_err2       : BUG#19107 2006-08-30 reggie

sql/sql_show.cc

+1 −1
Original line number Diff line number Diff line
@@ -5149,7 +5149,7 @@ static my_bool run_hton_fill_schema_files(THD *thd, st_plugin_int *plugin, 
  struct run_hton_fill_schema_files_args *args=

    (run_hton_fill_schema_files_args *) arg;

  handlerton *hton= (handlerton *)plugin->data;

  if(hton->fill_files_table)

  if(hton->fill_files_table && hton->state == SHOW_OPTION_YES)

    hton->fill_files_table(thd, args->tables, args->cond);

  return false;

}