Viewing all changes in revision 2643.137.22.
- Committer: timour at askmonty
- Date: 2012-11-06 09:52:55 UTC
- mfrom: (2502.1195.40 clone-5.1)
- mto: (2643.137.36 maria-5.1)
- mto: This revision was merged to the branch mainline in revision 3182.
- Revision ID: timour@askmonty.org-20121106095255-10b1yftq16je2ry1
Merge MySQL 5.1.66 -> MariaDB 5.1.65
- files added:
- mysql-test/suite/federated/include
- files removed:
- extra/yassl/taocrypt/src/crypto.cpp
- files renamed:
- mysql-test/suite/federated/federated.inc => mysql-test/suite/federated/include/federated.inc
- mysql-test/suite/federated/federated_cleanup.inc => mysql-test/suite/federated/include/federated_cleanup.inc
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
