diff options
| author | unknown <mskold/marty@linux.site> | 2006-09-15 15:56:20 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2006-09-15 15:56:20 +0200 |
| commit | bc4f0bd46203bd96dca5b4a2a7a135fa2bd58ce0 (patch) | |
| tree | e11e2747e9b8aa76ecd6c052db5d752930d0dba5 /vio/viosocket.c | |
| parent | a83390cbb55cfc58b5be965053070d76bd85d476 (diff) | |
| parent | 73db46fb4f662bce4f9933dcd7a54f709602a845 (diff) | |
| download | mariadb-git-bc4f0bd46203bd96dca5b4a2a7a135fa2bd58ce0.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/r/ndb_condition_pushdown.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
mysql-test/r/ndb_multi.result:
Merge
mysql-test/t/ndb_multi.test:
Merge
Diffstat (limited to 'vio/viosocket.c')
0 files changed, 0 insertions, 0 deletions