diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-02-23 16:26:45 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-02-23 16:26:45 +0300 |
| commit | f0d2fe34f2bd074dfc0f9ae6c5ffbc414a6f9b59 (patch) | |
| tree | 906d61216e1d999772c7a2a993909fc6915a9ab0 /sql/sql_profile.h | |
| parent | 0afa209018fad0a0863048cebfcc8f0a52b814ee (diff) | |
| parent | 6f78ef71d485fb3968355941860d012fc17a9c59 (diff) | |
| download | mariadb-git-f0d2fe34f2bd074dfc0f9ae6c5ffbc414a6f9b59.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in client/mysqltest.cc
Text conflict in configure.in
Text conflict in mysql-test/include/mtr_warnings.sql
Diffstat (limited to 'sql/sql_profile.h')
0 files changed, 0 insertions, 0 deletions