diff options
| author | unknown <pem@mysql.com> | 2006-03-28 15:08:17 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2006-03-28 15:08:17 +0200 |
| commit | 442383892ee708a39cfbfa86b58c03dd52489ffb (patch) | |
| tree | f02d71717e4d6d52bddb4c7779cd7fda6071655c /netware | |
| parent | 1d73c16b873084a14ca6d8119b83e3a3385debbf (diff) | |
| parent | e550d6e7e3d73d3c2e3236036cff977545c39d4d (diff) | |
| download | mariadb-git-442383892ee708a39cfbfa86b58c03dd52489ffb.tar.gz | |
Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
into mysql.com:/extern/mysql/5.0/bug17015/mysql-5.0-runtime
mysql-test/r/sp-error.result:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
sql/field.h:
Auto merged
sql/sp.cc:
Auto merged
Diffstat (limited to 'netware')
0 files changed, 0 insertions, 0 deletions