Merge hh-nb.hungers:/work/merge/mysql-5.1-build

into hh-nb.hungers:/work/merge/mysql-5.1-bug32664

Merge hh-nb.hungers:/work/merge/mysql-5.1-build
into hh-nb.hungers:/work/merge/mysql-5.1-bug32664
0c6e1743 · hhunger@hh-nb.hungers · d80b1ae3 · e4c3928f · 0c6e1743 · 0c6e1743
Commit 0c6e1743 authored Feb 22, 2008 by hhunger@hh-nb.hungers
6 changed files
--- a/.bzrignore
+++ b/.bzrignore
@@ -3019,3 +3019,4 @@ mysql-test/.DS_Store
 .DS_Store
 libmysqld/sql_profile.cc
 mysql-test/suite/funcs_1.tar.zip
+mysql-test/reg.log
--- a/mysql-test/r/events.result
+++ b/mysql-test/r/events.result
--- a/mysql-test/r/events_2.result
+++ b/mysql-test/r/events_2.result
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -15,7 +15,6 @@ concurrent_innodb        : BUG#21579 2006-08-11 mleich innodb_concurrent random
 ctype_big5               : BUG#26711 2007-06-21 Lars Test has never worked on Double Whopper

 federated_transactions   : Bug#29523 Transactions do not work
-events                   : Bug#32664 events.test fails randomly
 lowercase_table3         : Bug#32667 lowercase_table3.test reports to error log
 kill                 : Bug#29149: Test "kill" fails on Windows
 innodb_mysql         : Bug#32724: innodb_mysql.test fails randomly

--- a/mysql-test/t/events.test
+++ b/mysql-test/t/events.test
--- a/mysql-test/t/events_2.test
+++ b/mysql-test/t/events_2.test