Commit fee17864 authored by unknown's avatar unknown

Merge stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-5.1-axmrg


storage/myisam/mi_packrec.c:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge from 5.0
parents fbe27ca4 f53f8868
...@@ -20,3 +20,5 @@ binlog_multi_engine : Bug#32663 binlog_multi_engine.test fails randomly ...@@ -20,3 +20,5 @@ binlog_multi_engine : Bug#32663 binlog_multi_engine.test fails randomly
events : Bug#32664 events.test fails randomly events : Bug#32664 events.test fails randomly
events_scheduling : Bug#29830 Test case 'events_scheduling' fails on Mac OS X and Windows events_scheduling : Bug#29830 Test case 'events_scheduling' fails on Mac OS X and Windows
lowercase_table3 : Bug#32667 lowercase_table3.test reports to error log lowercase_table3 : Bug#32667 lowercase_table3.test reports to error log
rpl_log : Bug#32653: rpl_log.test fails randomly
rpl_view : Bug#32654: rpl_view.test fails randomly
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment