diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-09-27 12:22:16 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-09-27 12:22:16 +0400 |
| commit | 7c59445af08270ae3e34830b1d30a974f0ea4c4c (patch) | |
| tree | 4058c075ec977494b07adde59db20ff100e16dea /mysql-test/r/log_tables.result | |
| parent | 4e5b560dd80a54a462d5f98b5f6de28642144f55 (diff) | |
| parent | d4933af87efb8f7b01d48c4ba46ff196f73a193f (diff) | |
| download | mariadb-git-7c59445af08270ae3e34830b1d30a974f0ea4c4c.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21414
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
mysql-test/r/sp.result:
Manual merge.
mysql-test/t/sp.test:
Manual merge.
Diffstat (limited to 'mysql-test/r/log_tables.result')
0 files changed, 0 insertions, 0 deletions