diff options
| author | unknown <joerg@trift2.> | 2006-09-26 12:00:18 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2006-09-26 12:00:18 +0200 |
| commit | 3436f0acc1206c2614ee280b79e295c8deace91f (patch) | |
| tree | 328e949a755420518d38061bd0c079462eb7437c /sql-common | |
| parent | 16ea3ca1a23b4f12e327a0db3ac83d1118a4a958 (diff) | |
| parent | 0847bd9c2f701897e6c95ca56ebee8c415fd4d0c (diff) | |
| download | mariadb-git-3436f0acc1206c2614ee280b79e295c8deace91f.tar.gz | |
Merge trift2.:/MySQL/M50/clone-5.0
into trift2.:/MySQL/M50/push-5.0
mysql-test/r/func_time.result:
Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch.
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/type_date.result:
Auto merged
mysql-test/r/view.result:
Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch.
mysql-test/t/func_time.test:
Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch.
mysql-test/t/type_date.test:
Auto merged
mysql-test/t/view.test:
Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch.
sql/item_cmpfunc.cc:
Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch.
Diffstat (limited to 'sql-common')
0 files changed, 0 insertions, 0 deletions