diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-22 11:43:23 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-22 11:43:23 +0400 |
| commit | 941f2fb956a446d6f0e37581cd71ebdf889d5633 (patch) | |
| tree | 357eb02100ecceb9c157fe76f223296b10cbe950 /vio/viosocket.c | |
| parent | c242662096e1ce16b249c478702be54c190d3f5e (diff) | |
| parent | b70693f5825f0500cf7e519d7eac7759d4482a18 (diff) | |
| download | mariadb-git-941f2fb956a446d6f0e37581cd71ebdf889d5633.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/subselect3.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/item.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/subselect.result:
merging
mysql-test/t/subselect.test:
merging
sql/sql_base.cc:
mergin
sql/sql_class.h:
merging
sql/sql_select.cc:
merging
Diffstat (limited to 'vio/viosocket.c')
0 files changed, 0 insertions, 0 deletions