diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-22 23:59:20 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-22 23:59:20 +0400 |
| commit | 2c5395eedb85105f8ad7d58c0ce1902807dc0948 (patch) | |
| tree | b10a0e80530fde746ab966228b412ab454f075eb /mysql-test/mysql-test-run.pl | |
| parent | 3a222d57ad93f76a1a75ab459d0fe2a12be98d6c (diff) | |
| parent | b8c101df1a6d1c4f9f5a2ed1cbcf996610782844 (diff) | |
| download | mariadb-git-2c5395eedb85105f8ad7d58c0ce1902807dc0948.tar.gz | |
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
mysql-test/r/insert_select.result:
Auto merged
mysql-test/t/insert_select.test:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_select.h:
Auto merged
mysql-test/r/create.result:
merging
mysql-test/r/temp_table.result:
SCCS merged
mysql-test/r/type_float.result:
merging
mysql-test/r/union.result:
merging
mysql-test/t/temp_table.test:
merging
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
0 files changed, 0 insertions, 0 deletions