diff options
author | Marko Mäkelä <marko.makela@oracle.com> | 2011-09-14 15:44:34 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-09-14 15:44:34 +0300 |
commit | 3d6fc1711c8bff76c9bb848d4e06cdd2c2176e64 (patch) | |
tree | 8f02fe681a410b75eb060e630a9150f4a531c690 /sql/client_settings.h | |
parent | 3c18c37066215744076bd3381339be137010cf1b (diff) | |
parent | d60cdefc0da9e2d5a49499763fdf5577d9fbb609 (diff) | |
download | mariadb-git-3d6fc1711c8bff76c9bb848d4e06cdd2c2176e64.tar.gz |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'sql/client_settings.h')
0 files changed, 0 insertions, 0 deletions