diff options
| author | unknown <gshchepa/uchum@host.loc> | 2008-03-25 19:49:27 +0400 |
|---|---|---|
| committer | unknown <gshchepa/uchum@host.loc> | 2008-03-25 19:49:27 +0400 |
| commit | 7df182d57abb3bfdc8cd166900470b98cf581dd7 (patch) | |
| tree | 28e1a9b20779b7143359afb8313b57eed91d3094 /mysql-test/r/sp-code.result | |
| parent | 54ecaba8a6a1de3fb1b22ce996216109be535ffb (diff) | |
| parent | a9b04d580adad77009e9f567f2689a252709901a (diff) | |
| download | mariadb-git-7df182d57abb3bfdc8cd166900470b98cf581dd7.tar.gz | |
Merge host.loc:/home/uchum/work/5.0-opt
into host.loc:/home/uchum/work/5.1-opt
sql/sql_show.cc:
Auto merged
mysql-test/r/information_schema.result:
Merge with 5.0-opt.
mysql-test/t/information_schema.test:
Merge with 5.0-opt.
Diffstat (limited to 'mysql-test/r/sp-code.result')
0 files changed, 0 insertions, 0 deletions