diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-05 15:05:37 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-05 15:05:37 +0300 |
| commit | a45ea00b32a71ef5d123e102a7379f7d79a3dbbb (patch) | |
| tree | 0bf2d7fce335a1c38da55def00c6bfc5304db2ee /INSTALL-WIN-SOURCE | |
| parent | ad935d47088485c59e6425347307b7b908790e3d (diff) | |
| parent | 619037517f6827131f0f6367df57e28d1b695626 (diff) | |
| download | mariadb-git-a45ea00b32a71ef5d123e102a7379f7d79a3dbbb.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sys_vars.cc
Diffstat (limited to 'INSTALL-WIN-SOURCE')
0 files changed, 0 insertions, 0 deletions