diff options
author | unknown <pem@mysql.com> | 2006-01-19 11:48:07 +0100 |
---|---|---|
committer | unknown <pem@mysql.com> | 2006-01-19 11:48:07 +0100 |
commit | 663fe66468143aa457a93bd180998d8187d53ca6 (patch) | |
tree | 77998d0059ac8f7e597b7ada28b273f939d4a8d5 /include/sslopt-vars.h | |
parent | 48ac5c4a2b241d8fcc8f7266b4192664855e0ee6 (diff) | |
parent | 1e968057523db1313438368812b99a38ba460542 (diff) | |
download | mariadb-git-663fe66468143aa457a93bd180998d8187d53ca6.tar.gz |
Merge mysql.com:/extern/mysql/bk/mysql-5.0
into mysql.com:/extern/mysql/work/bug15658/mysql-5.0
mysql-test/r/sp-error.result:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Auto merged
Diffstat (limited to 'include/sslopt-vars.h')
0 files changed, 0 insertions, 0 deletions