Commit df722475 authored by unknown's avatar unknown

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

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


mysql-test/t/disabled.def:
  Manual merge from 5.0.
parents c0ecd863 7991e6a6
...@@ -22,3 +22,4 @@ kill : Bug#29149: Test "kill" fails on Windows ...@@ -22,3 +22,4 @@ kill : Bug#29149: Test "kill" fails on Windows
grant3 : Bug#32723: grant3.test fails grant3 : Bug#32723: grant3.test fails
innodb_mysql : Bug#32724: innodb_mysql.test fails randomly innodb_mysql : Bug#32724: innodb_mysql.test fails randomly
wait_timeout : Bug#32801 wait_timeout.test fails randomly wait_timeout : Bug#32801 wait_timeout.test fails randomly
kill : Bug#29149 Test "kill" fails on Windows
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