diff options
author | unknown <kostja@bodhi.local> | 2006-10-09 18:04:09 -0700 |
---|---|---|
committer | unknown <kostja@bodhi.local> | 2006-10-09 18:04:09 -0700 |
commit | c62dc96e484d698c2b76e27c1a2fba82ffbd18c9 (patch) | |
tree | 18ab96b6270c80632843024c9b756e13f21b0689 /sql/custom_conf.h | |
parent | 14251dbb7781bd21636a3637adc8f06eef08b728 (diff) | |
parent | fd68a0686d7d83a6b03792395045484051c92851 (diff) | |
download | mariadb-git-c62dc96e484d698c2b76e27c1a2fba82ffbd18c9.tar.gz |
Merge bodhi.local:/opt/local/work/mysql-5.0-root
into bodhi.local:/opt/local/work/mysql-5.0-runtime
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'sql/custom_conf.h')
0 files changed, 0 insertions, 0 deletions