diff options
| author | Luis Soares <luis.soares@oracle.com> | 2012-03-12 22:02:50 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2012-03-12 22:02:50 +0000 |
| commit | b06a48e413131caea8a2e056ea4891114d773251 (patch) | |
| tree | 29fd8334d96e61fb52a3293d8532ff41ac2bf6a6 /sql/sql_show.h | |
| parent | 273c626269cfcc7f20f1d0212d3aa3bff0c14f02 (diff) | |
| parent | c41a6fec10d043a85a2e5882cc8c259aee867f07 (diff) | |
| download | mariadb-git-b06a48e413131caea8a2e056ea4891114d773251.tar.gz | |
BUG#12400313
Manual merge from mysql-5.1 into mysql-5.5.
CONFLICTS
=========
Text conflict in sql/log.cc
Text conflict in sql/slave.cc
Diffstat (limited to 'sql/sql_show.h')
0 files changed, 0 insertions, 0 deletions