diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-24 10:12:07 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-24 10:12:07 +0300 |
| commit | 9f335d9e91901befc173fb44ade6a5ac3be01478 (patch) | |
| tree | a72ad839d2e6423a5e8af96908e8715517d83714 /libmysql | |
| parent | 88642ae7e6e396b5f898ebc126a45911a7f2a9d2 (diff) | |
| parent | 9721437edf2037d040fe34dffd87cac1eba30dde (diff) | |
| download | mariadb-git-9f335d9e91901befc173fb44ade6a5ac3be01478.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- storage/myisam/mi_static.c
Diffstat (limited to 'libmysql')
0 files changed, 0 insertions, 0 deletions