diff options
| author | unknown <mskold/marty@linux.site> | 2007-02-09 16:33:52 +0100 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2007-02-09 16:33:52 +0100 |
| commit | 4de01438d8ddef3b21dba0499f6b242559a9fb38 (patch) | |
| tree | efce2d7de5730ff836854179fc5ef6c90dc31ee0 /configure.in.rej | |
| parent | 0690e39b2a25d8378b3924d45e530d8bf037f4af (diff) | |
| parent | ef60c96f8bb7c8ab0c044750b39f56f1eb1953ea (diff) | |
| download | mariadb-git-4de01438d8ddef3b21dba0499f6b242559a9fb38.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'configure.in.rej')
0 files changed, 0 insertions, 0 deletions