diff options
| author | unknown <msvensson@pilot.(none)> | 2007-08-27 10:50:44 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-08-27 10:50:44 +0200 |
| commit | 5dc89e0f200e152616b670ab7399e8085b02c259 (patch) | |
| tree | e6773c6c56f45e306f485a779eb510810ab7096f /client/mysql.cc | |
| parent | f367d97cfcf105b849e5b561e1e0b2938f75be0f (diff) | |
| parent | bd55d4f17411212307be35fa51fcc551d261381c (diff) | |
| download | mariadb-git-5dc89e0f200e152616b670ab7399e8085b02c259.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/lib/mtr_misc.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
client/mysql_upgrade.c:
Manual merge 5.0->5.1
Diffstat (limited to 'client/mysql.cc')
0 files changed, 0 insertions, 0 deletions