diff options
author | Alexander Nozdrin <alik@sun.com> | 2010-02-03 19:28:40 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2010-02-03 19:28:40 +0300 |
commit | defe010c7368bf590bcdd6edd896c16a2febaae2 (patch) | |
tree | 1c4a1b44a1c27efa75b6d35089126bc9d68eebcf /win/configure.js | |
parent | cf55cf596e33bb5287bb8336972dbe3ae35fdad4 (diff) | |
parent | 090c75d2b0e202ca103215fbf1211d7a85defae5 (diff) | |
download | mariadb-git-defe010c7368bf590bcdd6edd896c16a2febaae2.tar.gz |
Manual merge from mysql-5.1-bugteam.
Conflicts:
- sql/mysqld.cc
Diffstat (limited to 'win/configure.js')
0 files changed, 0 insertions, 0 deletions