diff options
| author | Luis Soares <luis.soares@oracle.com> | 2010-12-07 16:11:13 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2010-12-07 16:11:13 +0000 |
| commit | 5d6e142b2b9a5973fc9b9a638e01e5b92223e4c8 (patch) | |
| tree | b5babca4ee608dc5e5daf9722eeb5c8414974565 /zlib | |
| parent | c872e3db8027e4e4638af9bd80b9d78c8a675a77 (diff) | |
| parent | bd0709cc8726e2d189df71138488ff7b2b004460 (diff) | |
| download | mariadb-git-5d6e142b2b9a5973fc9b9a638e01e5b92223e4c8.tar.gz | |
BUG#46166
Manual merge from mysql-5.1-bugteam into mysql-5.5-bugteam.
Conflicts
=========
Text conflict in sql/log.cc
Text conflict in sql/log.h
Text conflict in sql/slave.cc
Text conflict in sql/sql_parse.cc
Text conflict in sql/sql_priv.h
Diffstat (limited to 'zlib')
0 files changed, 0 insertions, 0 deletions