diff options
author | Konstantin Osipov <kostja@sun.com> | 2009-12-16 11:15:40 +0300 |
---|---|---|
committer | Konstantin Osipov <kostja@sun.com> | 2009-12-16 11:15:40 +0300 |
commit | 58b24720b65ff817f5dd587922eb678a8473895a (patch) | |
tree | 1d0c3078b9436d182d45761c7d398849cb856736 /sql/sql_servers.cc | |
parent | a64e56ac9305c981ffa39af056510784ca4cf76d (diff) | |
parent | 9b65f5782e110bed71cc3ed782029d73b1faa297 (diff) | |
download | mariadb-git-58b24720b65ff817f5dd587922eb678a8473895a.tar.gz |
Merge next-mr -> next-4284. Null-merge
the fix for Bug#37148, since it is null-merged into 6.0.
Diffstat (limited to 'sql/sql_servers.cc')
0 files changed, 0 insertions, 0 deletions