Viewing all changes in revision 466.
- Committer: Stewart Smith
- Date: 2012-08-20 03:14:02 UTC
- mfrom: (0.15739.191 mysql-5.1.65)
- Revision ID: stewart@flamingspork.com-20120820031402-h1levepfdsma8d2y
merge mysql-5.1.65 from lp:percona-server/upstream-5.1. This was a simple merge, 2 conflicts. One in mysqldump.cc (added code near Percona added code, simple fix) and one in sql_class.cc (new mutex added by PS and upstream, simple merge).
- files modified:
- Makefile
expand all
collapse all
added
removed
