diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-22 09:31:24 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-22 09:31:24 +0300 |
| commit | f238adf75d6bce104678be4e4a4a1d0bfde890c5 (patch) | |
| tree | 54f1c9bcd072587e1860fe234c3264734b3b8dc5 /support-files/mysql.spec.sh | |
| parent | 6ddab77da26d4529db403e573298f927d315adeb (diff) | |
| parent | 23e70189ab6412aa7af04dd81fe1b446b5f674c7 (diff) | |
| download | mariadb-git-f238adf75d6bce104678be4e4a4a1d0bfde890c5.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- storage/ibmdb2i/ha_ibmdb2i.cc
Diffstat (limited to 'support-files/mysql.spec.sh')
0 files changed, 0 insertions, 0 deletions