3766 Joerg Bruehe 2012-03-21 [merge]
Upmerge of empty merge changesets from the release backmerges (5.0.96, 5.1.62).
Manually resolved conflicts in ".bzr-mysql/default.conf" (tree name)
and in "storage/innodb_plugin" (does not belong into 5.5).
3765 Jimmy Yang 2012-03-21
backport Bug #47707 print some progress messages during shutdown of innodb
to mysql-5.5
rb://979 approved by Marko
modified:
storage/innobase/buf/buf0buf.c
storage/innobase/include/buf0buf.h
storage/innobase/include/srv0srv.h
storage/innobase/log/log0log.c
storage/innobase/srv/srv0srv.c
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5 branch (joerg.bruehe:3765 to 3766) | Joerg Bruehe | 21 Mar |
