diff options
| author | unknown <kroki/tomash@moonlight.home> | 2007-03-08 14:59:05 +0300 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.home> | 2007-03-08 14:59:05 +0300 |
| commit | 1b198eeb6893b4095c70df224eafb2c823f8970f (patch) | |
| tree | 3c483e70581b39cf33bb747381d9a8cb758e8a1f /sql/protocol.h | |
| parent | b841c9ebbd18daf02ae0a65c5521a6429ba77872 (diff) | |
| parent | ee09b41ea277ee3916509e8c2ee3145b3b2e6518 (diff) | |
| download | mariadb-git-1b198eeb6893b4095c70df224eafb2c823f8970f.tar.gz | |
Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug20492
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug20492
sql/sql_select.cc:
Auto merged
mysql-test/r/sp.result:
Manual merge.
mysql-test/t/sp.test:
Manual merge.
Diffstat (limited to 'sql/protocol.h')
0 files changed, 0 insertions, 0 deletions