diff options
| author | unknown <istruewing@chilla.local> | 2006-12-19 17:27:12 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-12-19 17:27:12 +0100 |
| commit | 35583c44eb5721f8986ee152cd12000691274bb1 (patch) | |
| tree | e25de42be105d89e62c4d1ebff2809116b218213 | |
| parent | 81e138e150652443dba5011ff567c163d94cc31e (diff) | |
| parent | 76da582ca5f8a93ae5ff7e7fdea1991d47658196 (diff) | |
| download | mariadb-git-35583c44eb5721f8986ee152cd12000691274bb1.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into chilla.local:/home/mydev/mysql-5.1-axmrg
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/sql_class.h:
Auto merged
configure.in:
Manual merge from 5.0.
0 files changed, 0 insertions, 0 deletions