diff options
author | unknown <msvensson@neptunus.(none)> | 2006-10-24 19:22:48 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-10-24 19:22:48 +0200 |
commit | fa6d7c505c29cdaec139d243473da63411aa188b (patch) | |
tree | 0ae82276a34a406883723b40f7e4188bcc538743 /include/mysql.h | |
parent | 7941fdd0271e5e772d925105aefe283b03ab1ba0 (diff) | |
parent | c7cedcd645703c80b076bae316affa23cee5bf73 (diff) | |
download | mariadb-git-fa6d7c505c29cdaec139d243473da63411aa188b.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'include/mysql.h')
0 files changed, 0 insertions, 0 deletions